[llvm] c71780c - Triple: Add constructor from enum entries (#190632)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 23 10:48:11 PDT 2026
Author: Matt Arsenault
Date: 2026-04-23T18:48:07+01:00
New Revision: c71780cf5879e0070bc40e4fd236ced93b2f50b8
URL: https://github.com/llvm/llvm-project/commit/c71780cf5879e0070bc40e4fd236ced93b2f50b8
DIFF: https://github.com/llvm/llvm-project/commit/c71780cf5879e0070bc40e4fd236ced93b2f50b8.diff
LOG: Triple: Add constructor from enum entries (#190632)
Don't require hardcoding the string names.
Added:
Modified:
llvm/include/llvm/TargetParser/Triple.h
llvm/lib/TargetParser/Triple.cpp
llvm/unittests/TargetParser/TripleTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
index bb646ce313354..6e26f14ab8448 100644
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -379,6 +379,12 @@ class Triple {
const Twine &OSStr);
LLVM_ABI Triple(const Twine &ArchStr, const Twine &VendorStr,
const Twine &OSStr, const Twine &EnvironmentStr);
+ LLVM_ABI Triple(ArchType A, SubArchType SA = NoSubArch,
+ VendorType V = UnknownVendor, OSType OS = UnknownOS);
+ LLVM_ABI Triple(ArchType A, SubArchType SA, VendorType V, OSType OS,
+ EnvironmentType E);
+ LLVM_ABI Triple(ArchType A, SubArchType SA, VendorType V, OSType OS,
+ EnvironmentType E, ObjectFormatType OF);
bool operator==(const Triple &Other) const {
return Arch == Other.Arch && SubArch == Other.SubArch &&
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
index e38923a9d92ff..80f7ef063c908 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -1343,6 +1343,32 @@ Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr,
ObjectFormat = getDefaultFormat(*this);
}
+Triple::Triple(ArchType A, SubArchType SA, VendorType V, OSType OS)
+ : Data((getArchName(A, SA) + Twine('-') + getVendorTypeName(V) +
+ Twine('-') + getOSTypeName(OS))
+ .str()),
+ Arch(A), SubArch(SA), Vendor(V), OS(OS),
+ ObjectFormat(getDefaultFormat(*this)) {}
+
+Triple::Triple(ArchType A, SubArchType SA, VendorType V, OSType OS,
+ EnvironmentType E)
+ : Data((getArchName(A, SA) + Twine('-') + getVendorTypeName(V) +
+ Twine('-') + getOSTypeName(OS) + Twine('-') +
+ getEnvironmentTypeName(E))
+ .str()),
+ Arch(A), SubArch(SA), Vendor(V), OS(OS), Environment(E),
+ ObjectFormat(getDefaultFormat(*this)) {}
+
+Triple::Triple(ArchType A, SubArchType SA, VendorType V, OSType OS,
+ EnvironmentType E, ObjectFormatType OF)
+ : Data((getArchName(A, SA) + Twine('-') + getVendorTypeName(V) +
+ Twine('-') + getOSTypeName(OS) + Twine('-') +
+ getEnvironmentTypeName(E) + Twine('-') +
+ getObjectFormatTypeName(OF))
+ .str()),
+ Arch(A), SubArch(SA), Vendor(V), OS(OS), Environment(E),
+ ObjectFormat(OF) {}
+
static VersionTuple parseVersionFromName(StringRef Name);
static StringRef getDXILArchNameFromShaderModel(StringRef ShaderModelStr) {
diff --git a/llvm/unittests/TargetParser/TripleTest.cpp b/llvm/unittests/TargetParser/TripleTest.cpp
index 5f83fdd0ba000..d65e7855881e6 100644
--- a/llvm/unittests/TargetParser/TripleTest.cpp
+++ b/llvm/unittests/TargetParser/TripleTest.cpp
@@ -1477,6 +1477,114 @@ TEST(TripleTest, ParsedIDs) {
EXPECT_EQ(Triple::ChipStar, T.getOS());
}
+TEST(TripleTest, EnumConstructor) {
+ {
+ Triple T(Triple::amdgcn, Triple::NoSubArch, Triple::AMD, Triple::AMDHSA);
+ EXPECT_EQ(T.getArch(), Triple::amdgcn);
+ EXPECT_EQ(T.getVendor(), Triple::AMD);
+ EXPECT_EQ(T.getOS(), Triple::AMDHSA);
+ EXPECT_EQ(T.getEnvironment(), Triple::UnknownEnvironment);
+ EXPECT_EQ(T.getObjectFormat(), Triple::ELF);
+ EXPECT_EQ(T.str(), "amdgcn-amd-amdhsa");
+ }
+
+ {
+ Triple T(Triple::amdgcn, Triple::NoSubArch, Triple::AMD, Triple::AMDHSA,
+ Triple::LLVM, Triple::ELF);
+ EXPECT_EQ(T.getArch(), Triple::amdgcn);
+ EXPECT_EQ(T.getVendor(), Triple::AMD);
+ EXPECT_EQ(T.getOS(), Triple::AMDHSA);
+ EXPECT_EQ(T.getEnvironment(), Triple::LLVM);
+ EXPECT_EQ(T.getObjectFormat(), Triple::ELF);
+ EXPECT_EQ(T.str(), "amdgcn-amd-amdhsa-llvm-elf");
+ }
+
+ {
+ Triple T(Triple::amdgcn, Triple::NoSubArch, Triple::AMD, Triple::AMDHSA,
+ Triple::LLVM);
+ EXPECT_EQ(T.getArch(), Triple::amdgcn);
+ EXPECT_EQ(T.getVendor(), Triple::AMD);
+ EXPECT_EQ(T.getOS(), Triple::AMDHSA);
+ EXPECT_EQ(T.getEnvironment(), Triple::LLVM);
+ EXPECT_EQ(T.getObjectFormat(), Triple::ELF);
+ EXPECT_EQ(T.str(), "amdgcn-amd-amdhsa-llvm");
+ }
+
+ {
+ Triple T(Triple::arm, Triple::ARMSubArch_v9_7a, Triple::PC, Triple::Linux,
+ Triple::GNU, Triple::COFF);
+ EXPECT_EQ(T.getArch(), Triple::arm);
+ EXPECT_EQ(T.getVendor(), Triple::PC);
+ EXPECT_EQ(T.getOS(), Triple::Linux);
+ EXPECT_EQ(T.getEnvironment(), Triple::GNU);
+ EXPECT_EQ(T.getObjectFormat(), Triple::COFF);
+ EXPECT_EQ(T.str(), "arm-pc-linux-gnu-coff");
+ }
+
+ {
+ Triple T(Triple::arm, Triple::ARMSubArch_v9_7a);
+ EXPECT_EQ(T.getArch(), Triple::arm);
+ EXPECT_EQ(T.getVendor(), Triple::UnknownVendor);
+ EXPECT_EQ(T.getOS(), Triple::UnknownOS);
+ EXPECT_EQ(T.getEnvironment(), Triple::UnknownEnvironment);
+ EXPECT_EQ(T.getObjectFormat(), Triple::ELF);
+ EXPECT_EQ(T.str(), "arm-unknown-unknown");
+ }
+
+ {
+ Triple T(Triple::x86_64);
+ EXPECT_EQ(T.getArch(), Triple::x86_64);
+ EXPECT_EQ(T.getVendor(), Triple::UnknownVendor);
+ EXPECT_EQ(T.getOS(), Triple::UnknownOS);
+ EXPECT_EQ(T.getEnvironment(), Triple::UnknownEnvironment);
+ EXPECT_EQ(T.getObjectFormat(), Triple::ELF);
+ EXPECT_EQ(T.str(), "x86_64-unknown-unknown");
+ }
+
+ {
+ Triple T(Triple::dxil);
+ EXPECT_EQ(T.getArch(), Triple::dxil);
+ EXPECT_EQ(T.getVendor(), Triple::UnknownVendor);
+ EXPECT_EQ(T.getOS(), Triple::UnknownOS);
+ EXPECT_EQ(T.getEnvironment(), Triple::UnknownEnvironment);
+ EXPECT_EQ(T.getObjectFormat(), Triple::DXContainer);
+ EXPECT_EQ(T.str(), "dxilv1.0-unknown-unknown");
+ }
+
+ {
+ Triple T(Triple::x86_64, Triple::NoSubArch, Triple::UnknownVendor,
+ Triple::UnknownOS, Triple::MSVC);
+ EXPECT_EQ(T.getArch(), Triple::x86_64);
+ EXPECT_EQ(T.getVendor(), Triple::UnknownVendor);
+ EXPECT_EQ(T.getOS(), Triple::UnknownOS);
+ EXPECT_EQ(T.getEnvironment(), Triple::MSVC);
+ EXPECT_EQ(T.getObjectFormat(), Triple::ELF);
+ EXPECT_EQ(T.str(), "x86_64-unknown-unknown-msvc");
+ }
+
+ {
+ Triple T(Triple::x86, Triple::NoSubArch, Triple::UnknownVendor,
+ Triple::Win32);
+ EXPECT_EQ(T.getArch(), Triple::x86);
+ EXPECT_EQ(T.getVendor(), Triple::UnknownVendor);
+ EXPECT_EQ(T.getOS(), Triple::Win32);
+ EXPECT_EQ(T.getEnvironment(), Triple::UnknownEnvironment);
+ EXPECT_EQ(T.getObjectFormat(), Triple::COFF);
+ EXPECT_EQ(T.str(), "i386-unknown-windows");
+ }
+
+ {
+ Triple T(Triple::x86, Triple::NoSubArch, Triple::PC, Triple::Win32,
+ Triple::MSVC);
+ EXPECT_EQ(T.getArch(), Triple::x86);
+ EXPECT_EQ(T.getVendor(), Triple::PC);
+ EXPECT_EQ(T.getOS(), Triple::Win32);
+ EXPECT_EQ(T.getEnvironment(), Triple::MSVC);
+ EXPECT_EQ(T.getObjectFormat(), Triple::COFF);
+ EXPECT_EQ(T.str(), "i386-pc-windows-msvc");
+ }
+}
+
static std::string Join(StringRef A, StringRef B, StringRef C) {
std::string Str = std::string(A);
Str += '-';
More information about the llvm-commits
mailing list