Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 11, 2024
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a236e3f
Added null check
OttoWRas Mar 21, 2024
b97355e
Changed fix to use compile guards
OttoWRas Mar 22, 2024
9f1374f
Added compile guards for LLVM to cpptest
OttoWRas Mar 22, 2024
62e1d24
Moved test and made it better
OttoWRas Apr 8, 2024
1e231e2
Update tests/cpp/target_test.cc
OttoWRas Apr 9, 2024
c4587b7
Changed function to use ICHECK
OttoWRas Apr 9, 2024
e5b03ca
Changed compile guards to use LLVM_VERSION
OttoWRas Apr 9, 2024
a2871f6
Added ICHECK, changed compile guard to LLVM_VERSION, Lint
OttoWRas Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/target/parsers/cpu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ namespace parsers {
namespace cpu {

Optional<String> DetectSystemTriple() {
#ifdef TVM_INFO_USE_LLVM
auto pf = tvm::runtime::Registry::Get("target.llvm_get_system_triple");
if (pf->defined()) {
return (*pf)();
}
#endif
return {};
}

Expand Down
31 changes: 16 additions & 15 deletions tests/cpp/target_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ TEST(TargetCreation, ProcessStrings) {
ASSERT_EQ(array7[1][1][0], "fred");
}

#ifdef TVM_INFO_USE_LLVM
// Checks that malformed options cause an assertion.
TEST(TargetCreation, LLVMCommandLineParseFatalDashDashDash) {
tvm::codegen::LLVMInstance inst;
Expand Down Expand Up @@ -448,6 +449,21 @@ 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());

Optional<String> mtriple = target->GetAttr<String>("mtriple");
auto pf = tvm::runtime::Registry::Get("target.llvm_get_system_triple");
ASSERT_TRUE(pf->defined());
}

#endif

TVM_REGISTER_TARGET_KIND("test_external_codegen_0", kDLCUDA)
.set_attr<Bool>(tvm::attr::kIsExternalCodegen, Bool(true));

Expand Down Expand Up @@ -498,21 +514,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);
Expand Down
5 changes: 4 additions & 1 deletion tests/cpp/tir_scalable_datatype.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_INFO_USE_LLVM
#include <llvm/IR/Intrinsics.h>
#endif

#include "../../src/script/printer/utils.h"

using ::testing::HasSubstr;
Expand Down