[BugFix][Target] Added null check to fix segfault at ->defined() in cpu.cc DetectSystemTriple()

src/target/parsers/cpu.cc

@@ -29,10 +29,12 @@ namespace parsers {
 namespace cpu {
 
 Optional<String> DetectSystemTriple() {
+#ifdef TVM_LLVM_VERSION
   auto pf = tvm::runtime::Registry::Get("target.llvm_get_system_triple");
-  if (pf->defined()) {
-    return (*pf)();
-  }
+  ICHECK(pf != nullptr) << "The target llvm_get_system_triple was not found, "
+                           "please compile with USE_LLVM = ON";
+  return (*pf)();
+#endif
   return {};
 }
 

tests/cpp/target_test.cc

@@ -290,6 +290,7 @@ TEST(TargetCreation, ProcessStrings) {
   ASSERT_EQ(array7[1][1][0], "fred");
 }
 
+#ifdef TVM_LLVM_VERSION
 // Checks that malformed options cause an assertion.
 TEST(TargetCreation, LLVMCommandLineParseFatalDashDashDash) {
   tvm::codegen::LLVMInstance inst;
@@ -448,6 +449,25 @@ TEST(TargetCreation, LLVMCommandLineSaveRestore) {
   ASSERT_FALSE(info.MatchesGlobalState());
 }
 
+TEST(TargetCreation, DetectSystemTriple) {
+  Map<String, ObjectRef> config = {
+      {"kind", String("llvm")},
+  };
+
+  Target target = Target(config);
+  ICHECK_EQ(target->kind, TargetKind::Get("llvm").value());
+
+  auto pf = tvm::runtime::Registry::Get("target.llvm_get_system_triple");
+  if (pf == nullptr) {
+    GTEST_SKIP() << "LLVM is not available, skipping test";
+  }
+
+  Optional<String> mtriple = target->GetAttr<String>("mtriple");
+  ASSERT_TRUE(mtriple.value() == String((*pf)()));
+}
+
+#endif
+
 TVM_REGISTER_TARGET_KIND("test_external_codegen_0", kDLCUDA)
     .set_attr<Bool>(tvm::attr::kIsExternalCodegen, Bool(true));
 
@@ -498,21 +518,6 @@ TEST(TargetCreation, DeduplicateKeys) {
   ICHECK_EQ(target->GetAttr<String>("device"), "arm_cpu");
 }
 
-TEST(TargetCreation, DetectSystemTriple) {
-  Map<String, ObjectRef> config = {
-      {"kind", String("llvm")},
-  };
-
-  Target target = Target(config);
-  ICHECK_EQ(target->kind, TargetKind::Get("llvm").value());
-
-  Optional<String> mtriple = target->GetAttr<String>("mtriple");
-  auto pf = tvm::runtime::Registry::Get("target.llvm_get_system_triple");
-  if (!pf->defined()) {
-    GTEST_SKIP() << "LLVM is not available, skipping test";
-  }
-}
-
 TEST(TargetKindRegistry, ListTargetKinds) {
   Array<String> names = TargetKindRegEntry::ListTargetKinds();
   ICHECK_EQ(names.empty(), false);

tests/cpp/tir_scalable_datatype.cc

@@ -19,11 +19,14 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <llvm/IR/Intrinsics.h>
 #include <tvm/runtime/data_type.h>
 #include <tvm/tir/builtin.h>
 #include <tvm/tir/expr.h>
 
+#ifdef TVM_LLVM_VERSION
+#include <llvm/IR/Intrinsics.h>
+#endif
+
 #include "../../src/script/printer/utils.h"
 
 using ::testing::HasSubstr;