diff --git a/src/codegen/llvm/codegen_cpu.cc b/src/codegen/llvm/codegen_cpu.cc
index 7b3d1301f756c2026fe07d5e34afa4181cee9f43..2c571e851e9cf8f1a92dc0b995b98cb420f098ec 100644
--- a/src/codegen/llvm/codegen_cpu.cc
+++ b/src/codegen/llvm/codegen_cpu.cc
@@ -318,9 +318,11 @@ void CodeGenCPU::CreateComputeScope(const AttrStmt* op) {
       // set non alias.
 #if TVM_LLVM_VERSION >= 50
       fcompute->addParamAttr(idx + 1, llvm::Attribute::NoAlias);
+      // always not inline compute function to make the code structure clean
 #else
       fcompute->setDoesNotAlias(idx + 1);
 #endif
+      fcompute->addFnAttr(llvm::Attribute::NoInline);
     }
   }
   std::swap(function_, fcompute);
diff --git a/src/pass/make_api.cc b/src/pass/make_api.cc
index fd1dbd88e4edcd328cd4fd833b199087dc1bf707..5f124e5690c69523b0e235f9692bcc685fbc7282 100644
--- a/src/pass/make_api.cc
+++ b/src/pass/make_api.cc
@@ -79,7 +79,8 @@ LoweredFunc MakeAPI(Stmt body,
     args.push_back(v_packed_arg_type_ids);
     args.push_back(v_num_packed_args);
     std::ostringstream os;
-    os << "expected num_args to be " << num_packed_args;
+
+    os << name << ": num_args should be " << num_packed_args;
     seq_init.emplace_back(
         MakeAssertEQ(v_num_packed_args, num_packed_args, os.str()));
   }
@@ -98,19 +99,19 @@ LoweredFunc MakeAPI(Stmt body,
       Type t = v_arg.type();
       if (t.is_handle()) {
         std::ostringstream msg;
-        msg << "Expect argument " << i << " to be pointer";
+        msg << name << ": Expect arg[" << i << "] to be pointer";
         seq_check.emplace_back(
             AssertStmt::make(tcode == kHandle ||
                              tcode == kArrayHandle ||
                              tcode == kNull, msg.str(), nop));
       } else if (t.is_int() || t.is_uint()) {
         std::ostringstream msg;
-        msg << "Expect argument " << i << " to be int";
+        msg << name << ": Expect arg[" << i << "] to be int";
         seq_check.emplace_back(AssertStmt::make(tcode == kInt, msg.str(), nop));
       } else {
         CHECK(t.is_float());
         std::ostringstream msg;
-        msg << "Expect argument " << i << " to be float";
+        msg << name << ": Expect arg[" << i << "] to be float";
         seq_check.emplace_back(AssertStmt::make(tcode == kFloat, msg.str(), nop));
       }
     } else {