Skip to content

[DXIL] Add DXIL SubArch to correspond to version number #89125

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 6 commits into from
Apr 18, 2024
+110 −1
Merged

[DXIL] Add DXIL SubArch to correspond to version number #89125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ff66c1
[DXIL] Add DXIL SubArch to correspond to version number
bharadwajy Apr 17, 2024
532fa6d
Merge dxil comparison per PR feedback.
bharadwajy Apr 17, 2024
0a6afe0
Add a couple of additional tests per PR feedback
bharadwajy Apr 17, 2024
816021a
Spell out all valid DXIL SubArch values.
bharadwajy Apr 17, 2024
72a033c
Fix code format per git-clang-format
bharadwajy Apr 17, 2024
93a8e55
Incorporate PR feedback.
bharadwajy Apr 18, 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
11 changes: 11 additions & 0 deletions llvm/include/llvm/TargetParser/Triple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,17 @@ class Triple {
SPIRVSubArch_v14,
SPIRVSubArch_v15,
SPIRVSubArch_v16,

// DXIL sub-arch corresponds to its version.
DXILSubArch_v1_0,
DXILSubArch_v1_1,
DXILSubArch_v1_2,
DXILSubArch_v1_3,
DXILSubArch_v1_4,
DXILSubArch_v1_5,
DXILSubArch_v1_6,
DXILSubArch_v1_7,
DXILSubArch_v1_8,
};
enum VendorType {
UnknownVendor,
Expand Down
17 changes: 16 additions & 1 deletion llvm/lib/TargetParser/Triple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,9 @@ static Triple::ArchType parseArch(StringRef ArchName) {
.Case("csky", Triple::csky)
.Case("loongarch32", Triple::loongarch32)
.Case("loongarch64", Triple::loongarch64)
.Case("dxil", Triple::dxil)
.Cases("dxil", "dxilv1.0", "dxilv1.1", "dxilv1.2", "dxilv1.3",
"dxilv1.4", "dxilv1.5", "dxilv1.6", "dxilv1.7", "dxilv1.8",
Triple::dxil)
.Case("xtensa", Triple::xtensa)
.Default(Triple::UnknownArch);

Expand Down Expand Up @@ -741,6 +743,19 @@ static Triple::SubArchType parseSubArch(StringRef SubArchName) {
.EndsWith("v1.6", Triple::SPIRVSubArch_v16)
.Default(Triple::NoSubArch);

if (SubArchName.starts_with("dxil"))
return StringSwitch<Triple::SubArchType>(SubArchName)
.EndsWith("v1.0", Triple::DXILSubArch_v1_0)
.EndsWith("v1.1", Triple::DXILSubArch_v1_1)
.EndsWith("v1.2", Triple::DXILSubArch_v1_2)
.EndsWith("v1.3", Triple::DXILSubArch_v1_3)
.EndsWith("v1.4", Triple::DXILSubArch_v1_4)
.EndsWith("v1.5", Triple::DXILSubArch_v1_5)
.EndsWith("v1.6", Triple::DXILSubArch_v1_6)
.EndsWith("v1.7", Triple::DXILSubArch_v1_7)
.EndsWith("v1.8", Triple::DXILSubArch_v1_8)
.Default(Triple::NoSubArch);

StringRef ARMSubArch = ARM::getCanonicalArchName(SubArchName);

// For now, this is the small part. Early return.
Expand Down
83 changes: 83 additions & 0 deletions llvm/unittests/TargetParser/TripleTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,109 +868,192 @@ TEST(TripleTest, ParsedIDs) {

T = Triple("dxil-unknown-shadermodel-pixel");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Pixel, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-vertex");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Vertex, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-geometry");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Geometry, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-hull");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Hull, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-domain");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Domain, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-compute");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Compute, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-library");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Library, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-raygeneration");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::RayGeneration, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-intersection");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Intersection, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-anyhit");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::AnyHit, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-closesthit");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::ClosestHit, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-miss");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Miss, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-callable");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Callable, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-mesh");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Mesh, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxil-unknown-shadermodel-amplification");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::ShaderModel, T.getOS());
EXPECT_EQ(Triple::Amplification, T.getEnvironment());
EXPECT_FALSE(T.supportsCOMDAT());

T = Triple("dxilv1.0-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_0, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.1-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_1, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.2-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_2, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.3-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_3, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.4-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_4, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.5-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_5, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.6-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_6, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.7-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_7, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxilv1.8-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::DXILSubArch_v1_8, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

// Check specification of unknown SubArch results in
// unknown architecture.
T = Triple("dxilv1.999-unknown-unknown");
EXPECT_EQ(Triple::UnknownArch, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth pointing out in a comment that this is a negative test case and that it's intentional that we're checking for an unknown triple here.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're going to test an unknown version, maybe we should pick one that isn't likely to happen anytime soon... Since we just released 1.8 and we're publicly working on previews for potential new features, seems like 1.9 could happen imminently. 1.99 seems like it is a long way off though.

EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("dxil-unknown-unknown");
EXPECT_EQ(Triple::dxil, T.getArch());
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
EXPECT_EQ(Triple::UnknownOS, T.getOS());

T = Triple("xtensa");
EXPECT_EQ(Triple::xtensa, T.getArch());
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
Expand Down