addressed upstream comments-2

Author: d-smirnov

include/tvm/ir/memory_pools.h

@@ -234,7 +234,7 @@ class WorkspacePoolInfo : public PoolInfo {
 
 /*
  * \brief The ConstantInfoNode contains numeric literal in RO pool
- * Used in initialisation of RO memory
+ * Used to initialise RO memory in ConstantPoolInfo
  */
 struct ConstantInfoNode : public Object {
   String name_hint;

include/tvm/runtime/metadata_types.h

@@ -96,7 +96,7 @@ struct TVMConstantInfo {
   const char* name_hint;
   /*! \brief Offset in bytes of the constant */
   int64_t byte_offset;
-  /*! \brief lenght of the data_bytes field */
+  /*! \brief length of the data_bytes field */
   int64_t data_len;
   /*! \brief data bytes of serialized NDArray */
   const void* data_bytes;

python/tvm/ir/memory_pools.py

@@ -217,7 +217,7 @@ def __init__(
 @register_object("ir.ConstantPoolInfo")
 class ConstantPoolInfo(PoolInfo):
     """ConstantPoolInfo object holds information related to RO memory pools
-    where the statically sized allocate nodes will pooled into.
+    where the statically sized allocate nodes are pooled into.
 
     Parameters
     ----------

python/tvm/relay/build_module.py

@@ -652,7 +652,7 @@ def _make_executor(self, expr=None):
         # generated code.
         temp_so_dir = contrib_utils.TempDirectory()
         temp_so = temp_so_dir / "temp.so"
-        mod.export_library(temp_so, cc="gcc", options=["-std=c++11"])
+        mod.export_library(temp_so, cc="gcc", options=["-std=c11"])
 
         mod = load_module(temp_so)
         aot_mod = mod["default"](self.device)

src/target/llvm/codegen_cpu.cc

@@ -1103,7 +1103,7 @@ class MetadataSerializerLLVM : public AttrVisitor {
          llvm::ConstantInt::get(llvm_types_->t_uint8, value->lanes(), false /* isSigned */)}));
   }
 
-  // Serialiding NDArray as tuple of len, data
+  // Serializing NDArray as tuple of len, data
   void Visit(const char* key, runtime::NDArray* value) final {
     std::string bytes;
     dmlc::MemoryStringStream stream(&bytes);

src/tir/usmp/analysis/extract_buffer_info.cc

@@ -574,9 +574,8 @@ BufferInfoAnalysis BufferInfoExtractor::operator()(const PrimFunc& main_func) {
   }
 
   // All ConstantPoolInfo items should have conflicts with each other
-  // as they will be placed in RO segment and pre-initialized
-
-  // split buffers to vars (WorkspacePoolInfo items) and constants (ConstantPoolInfo items)
+  // as they will be placed in RO segment and pre-initialized. To achieve this
+  // first, split buffers to vars (WorkspacePoolInfo items) and constants (ConstantPoolInfo items):
   Array<BufferInfo> buffer_info_vars;
   Array<BufferInfo> buffer_info_constants;
   for (const auto& kv : this->buffer_info_map_) {
@@ -591,7 +590,7 @@ BufferInfoAnalysis BufferInfoExtractor::operator()(const PrimFunc& main_func) {
       << "missing value";
 
   Map<ObjectRef, ObjectRef> srch;
-  // intersect with each other, as all constants should exist at the same time
+  // Then intersect constants with each other, as all constants should exist at the same time:
   for (const auto& buf : buffer_info_constants) {
     srch.Set(buf, buf);
     Array<ObjectRef> conflicts;
@@ -600,7 +599,7 @@ BufferInfoAnalysis BufferInfoExtractor::operator()(const PrimFunc& main_func) {
     buf->conflicts.Assign(conflicts.begin(), conflicts.end());
   }
 
-  // remove all conflicts with constants
+  // And third, remove all conflicts between constants and vars:
   for (const auto& buf : buffer_info_vars) {
     Array<ObjectRef> conflicts;
     std::copy_if(buf->conflicts.begin(), buf->conflicts.end(), std::back_inserter(conflicts),

src/tir/usmp/transform/convert_pool_allocations_to_offsets.cc

@@ -62,7 +62,7 @@ class PoolAllocationToOffsetConverter : public StmtExprMutator {
         AllocateConst allocate_const_node = Downcast<AllocateConst>(kv.first);
         extent_size = CalculateExtentsSize(allocate_const_node.operator->());
       } else {
-        LOG(FATAL) << "Not supported node type " << kv.first->GetTypeKey();
+        ICHECK(false) << "Not supported node type " << kv.first->GetTypeKey();
       }
       PoolAllocation pool_allocation = kv.second;
       PoolInfo pool_info = pool_allocation->pool_info;

tests/python/relay/aot/test_cpp_aot.py

@@ -108,7 +108,7 @@ def @main(%data : Tensor[(1, 3, 64, 64), uint8], %weight : Tensor[(3, 3, 5, 5),
         )
     temp_dir = tvm.contrib.utils.TempDirectory()
     test_so_path = temp_dir / "test.so"
-    mod.export_library(test_so_path, cc="gcc", options=["-std=c++11", "-g3", "-O0"])
+    mod.export_library(test_so_path, cc="gcc", options=["-std=c11", "-g3", "-O0"])
     loaded_mod = tvm.runtime.load_module(test_so_path)
     runner = tvm.runtime.executor.AotModule(loaded_mod["default"](tvm.cpu(0)))
     runner.set_input(**inputs)
@@ -190,8 +190,7 @@ def test_pass_wrong_device_arg():
 
     temp_dir = tvm.contrib.utils.TempDirectory()
     test_so_path = temp_dir / "test.so"
-    # gnu++14 is used due to '0x1p-0' issue
-    mod.export_library(test_so_path, cc="c++", options=["-std=gnu++14", "-g3", "-O0"])
+    mod.export_library(test_so_path, cc="gcc", options=["-std=c11", "-g3", "-O0"])
     loaded_mod = tvm.runtime.load_module(test_so_path)
 
     with pytest.raises(tvm.TVMError) as error: