Skip to content

Commit 93a8e55

Browse files
bharadwajybharadwajy
committed
Incorporate PR feedback.
Change enum value from the form DXILSubArch_v<major><minor> to DXILSubArch_v<major>_<minor> Add comment in test
1 parent 72a033c commit 93a8e55

File tree

3 files changed

+45
-28
lines changed

3 files changed

+45
-28
lines changed

‎llvm/include/llvm/TargetParser/Triple.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ class Triple {
167167
SPIRVSubArch_v16,
168168

169169
// DXIL sub-arch corresponds to its version.
170-
DXILSubArch_v10,
171-
DXILSubArch_v11,
172-
DXILSubArch_v12,
173-
DXILSubArch_v13,
174-
DXILSubArch_v14,
175-
DXILSubArch_v15,
176-
DXILSubArch_v16,
177-
DXILSubArch_v17,
178-
DXILSubArch_v18,
170+
DXILSubArch_v1_0,
171+
DXILSubArch_v1_1,
172+
DXILSubArch_v1_2,
173+
DXILSubArch_v1_3,
174+
DXILSubArch_v1_4,
175+
DXILSubArch_v1_5,
176+
DXILSubArch_v1_6,
177+
DXILSubArch_v1_7,
178+
DXILSubArch_v1_8,
179179
};
180180
enum VendorType {
181181
UnknownVendor,

‎llvm/lib/TargetParser/Triple.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -745,15 +745,15 @@ static Triple::SubArchType parseSubArch(StringRef SubArchName) {
745745

746746
if (SubArchName.starts_with("dxil"))
747747
return StringSwitch<Triple::SubArchType>(SubArchName)
748-
.EndsWith("v1.0", Triple::DXILSubArch_v10)
749-
.EndsWith("v1.1", Triple::DXILSubArch_v11)
750-
.EndsWith("v1.2", Triple::DXILSubArch_v12)
751-
.EndsWith("v1.3", Triple::DXILSubArch_v13)
752-
.EndsWith("v1.4", Triple::DXILSubArch_v14)
753-
.EndsWith("v1.5", Triple::DXILSubArch_v15)
754-
.EndsWith("v1.6", Triple::DXILSubArch_v16)
755-
.EndsWith("v1.7", Triple::DXILSubArch_v17)
756-
.EndsWith("v1.8", Triple::DXILSubArch_v18)
748+
.EndsWith("v1.0", Triple::DXILSubArch_v1_0)
749+
.EndsWith("v1.1", Triple::DXILSubArch_v1_1)
750+
.EndsWith("v1.2", Triple::DXILSubArch_v1_2)
751+
.EndsWith("v1.3", Triple::DXILSubArch_v1_3)
752+
.EndsWith("v1.4", Triple::DXILSubArch_v1_4)
753+
.EndsWith("v1.5", Triple::DXILSubArch_v1_5)
754+
.EndsWith("v1.6", Triple::DXILSubArch_v1_6)
755+
.EndsWith("v1.7", Triple::DXILSubArch_v1_7)
756+
.EndsWith("v1.8", Triple::DXILSubArch_v1_8)
757757
.Default(Triple::NoSubArch);
758758

759759
StringRef ARMSubArch = ARM::getCanonicalArchName(SubArchName);

‎llvm/unittests/TargetParser/TripleTest.cpp

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -868,164 +868,181 @@ TEST(TripleTest, ParsedIDs) {
868868

869869
T = Triple("dxil-unknown-shadermodel-pixel");
870870
EXPECT_EQ(Triple::dxil, T.getArch());
871+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
871872
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
872873
EXPECT_EQ(Triple::ShaderModel, T.getOS());
873874
EXPECT_EQ(Triple::Pixel, T.getEnvironment());
874875
EXPECT_FALSE(T.supportsCOMDAT());
875876

876877
T = Triple("dxil-unknown-shadermodel-vertex");
877878
EXPECT_EQ(Triple::dxil, T.getArch());
879+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
878880
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
879881
EXPECT_EQ(Triple::ShaderModel, T.getOS());
880882
EXPECT_EQ(Triple::Vertex, T.getEnvironment());
881883
EXPECT_FALSE(T.supportsCOMDAT());
882884

883885
T = Triple("dxil-unknown-shadermodel-geometry");
884886
EXPECT_EQ(Triple::dxil, T.getArch());
887+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
885888
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
886889
EXPECT_EQ(Triple::ShaderModel, T.getOS());
887890
EXPECT_EQ(Triple::Geometry, T.getEnvironment());
888891
EXPECT_FALSE(T.supportsCOMDAT());
889892

890893
T = Triple("dxil-unknown-shadermodel-hull");
891894
EXPECT_EQ(Triple::dxil, T.getArch());
895+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
892896
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
893897
EXPECT_EQ(Triple::ShaderModel, T.getOS());
894898
EXPECT_EQ(Triple::Hull, T.getEnvironment());
895899
EXPECT_FALSE(T.supportsCOMDAT());
896900

897901
T = Triple("dxil-unknown-shadermodel-domain");
898902
EXPECT_EQ(Triple::dxil, T.getArch());
903+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
899904
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
900905
EXPECT_EQ(Triple::ShaderModel, T.getOS());
901906
EXPECT_EQ(Triple::Domain, T.getEnvironment());
902907
EXPECT_FALSE(T.supportsCOMDAT());
903908

904909
T = Triple("dxil-unknown-shadermodel-compute");
905910
EXPECT_EQ(Triple::dxil, T.getArch());
911+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
906912
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
907913
EXPECT_EQ(Triple::ShaderModel, T.getOS());
908914
EXPECT_EQ(Triple::Compute, T.getEnvironment());
909915
EXPECT_FALSE(T.supportsCOMDAT());
910916

911917
T = Triple("dxil-unknown-shadermodel-library");
912918
EXPECT_EQ(Triple::dxil, T.getArch());
919+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
913920
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
914921
EXPECT_EQ(Triple::ShaderModel, T.getOS());
915922
EXPECT_EQ(Triple::Library, T.getEnvironment());
916923
EXPECT_FALSE(T.supportsCOMDAT());
917924

918925
T = Triple("dxil-unknown-shadermodel-raygeneration");
919926
EXPECT_EQ(Triple::dxil, T.getArch());
927+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
920928
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
921929
EXPECT_EQ(Triple::ShaderModel, T.getOS());
922930
EXPECT_EQ(Triple::RayGeneration, T.getEnvironment());
923931
EXPECT_FALSE(T.supportsCOMDAT());
924932

925933
T = Triple("dxil-unknown-shadermodel-intersection");
926934
EXPECT_EQ(Triple::dxil, T.getArch());
935+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
927936
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
928937
EXPECT_EQ(Triple::ShaderModel, T.getOS());
929938
EXPECT_EQ(Triple::Intersection, T.getEnvironment());
930939
EXPECT_FALSE(T.supportsCOMDAT());
931940

932941
T = Triple("dxil-unknown-shadermodel-anyhit");
933942
EXPECT_EQ(Triple::dxil, T.getArch());
943+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
934944
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
935945
EXPECT_EQ(Triple::ShaderModel, T.getOS());
936946
EXPECT_EQ(Triple::AnyHit, T.getEnvironment());
937947
EXPECT_FALSE(T.supportsCOMDAT());
938948

939949
T = Triple("dxil-unknown-shadermodel-closesthit");
940950
EXPECT_EQ(Triple::dxil, T.getArch());
951+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
941952
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
942953
EXPECT_EQ(Triple::ShaderModel, T.getOS());
943954
EXPECT_EQ(Triple::ClosestHit, T.getEnvironment());
944955
EXPECT_FALSE(T.supportsCOMDAT());
945956

946957
T = Triple("dxil-unknown-shadermodel-miss");
947958
EXPECT_EQ(Triple::dxil, T.getArch());
959+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
948960
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
949961
EXPECT_EQ(Triple::ShaderModel, T.getOS());
950962
EXPECT_EQ(Triple::Miss, T.getEnvironment());
951963
EXPECT_FALSE(T.supportsCOMDAT());
952964

953965
T = Triple("dxil-unknown-shadermodel-callable");
954966
EXPECT_EQ(Triple::dxil, T.getArch());
967+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
955968
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
956969
EXPECT_EQ(Triple::ShaderModel, T.getOS());
957970
EXPECT_EQ(Triple::Callable, T.getEnvironment());
958971
EXPECT_FALSE(T.supportsCOMDAT());
959972

960973
T = Triple("dxil-unknown-shadermodel-mesh");
961974
EXPECT_EQ(Triple::dxil, T.getArch());
975+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
962976
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
963977
EXPECT_EQ(Triple::ShaderModel, T.getOS());
964978
EXPECT_EQ(Triple::Mesh, T.getEnvironment());
965979
EXPECT_FALSE(T.supportsCOMDAT());
966980

967981
T = Triple("dxil-unknown-shadermodel-amplification");
968982
EXPECT_EQ(Triple::dxil, T.getArch());
983+
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
969984
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
970985
EXPECT_EQ(Triple::ShaderModel, T.getOS());
971986
EXPECT_EQ(Triple::Amplification, T.getEnvironment());
972987
EXPECT_FALSE(T.supportsCOMDAT());
973988

974989
T = Triple("dxilv1.0-unknown-unknown");
975990
EXPECT_EQ(Triple::dxil, T.getArch());
976-
EXPECT_EQ(Triple::DXILSubArch_v10, T.getSubArch());
991+
EXPECT_EQ(Triple::DXILSubArch_v1_0, T.getSubArch());
977992
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
978993
EXPECT_EQ(Triple::UnknownOS, T.getOS());
979994

980995
T = Triple("dxilv1.1-unknown-unknown");
981996
EXPECT_EQ(Triple::dxil, T.getArch());
982-
EXPECT_EQ(Triple::DXILSubArch_v11, T.getSubArch());
997+
EXPECT_EQ(Triple::DXILSubArch_v1_1, T.getSubArch());
983998
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
984999
EXPECT_EQ(Triple::UnknownOS, T.getOS());
9851000

9861001
T = Triple("dxilv1.2-unknown-unknown");
9871002
EXPECT_EQ(Triple::dxil, T.getArch());
988-
EXPECT_EQ(Triple::DXILSubArch_v12, T.getSubArch());
1003+
EXPECT_EQ(Triple::DXILSubArch_v1_2, T.getSubArch());
9891004
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
9901005
EXPECT_EQ(Triple::UnknownOS, T.getOS());
9911006

9921007
T = Triple("dxilv1.3-unknown-unknown");
9931008
EXPECT_EQ(Triple::dxil, T.getArch());
994-
EXPECT_EQ(Triple::DXILSubArch_v13, T.getSubArch());
1009+
EXPECT_EQ(Triple::DXILSubArch_v1_3, T.getSubArch());
9951010
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
9961011
EXPECT_EQ(Triple::UnknownOS, T.getOS());
9971012

9981013
T = Triple("dxilv1.4-unknown-unknown");
9991014
EXPECT_EQ(Triple::dxil, T.getArch());
1000-
EXPECT_EQ(Triple::DXILSubArch_v14, T.getSubArch());
1015+
EXPECT_EQ(Triple::DXILSubArch_v1_4, T.getSubArch());
10011016
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
10021017
EXPECT_EQ(Triple::UnknownOS, T.getOS());
10031018

10041019
T = Triple("dxilv1.5-unknown-unknown");
10051020
EXPECT_EQ(Triple::dxil, T.getArch());
1006-
EXPECT_EQ(Triple::DXILSubArch_v15, T.getSubArch());
1021+
EXPECT_EQ(Triple::DXILSubArch_v1_5, T.getSubArch());
10071022
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
10081023
EXPECT_EQ(Triple::UnknownOS, T.getOS());
10091024

10101025
T = Triple("dxilv1.6-unknown-unknown");
10111026
EXPECT_EQ(Triple::dxil, T.getArch());
1012-
EXPECT_EQ(Triple::DXILSubArch_v16, T.getSubArch());
1027+
EXPECT_EQ(Triple::DXILSubArch_v1_6, T.getSubArch());
10131028
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
10141029
EXPECT_EQ(Triple::UnknownOS, T.getOS());
10151030

10161031
T = Triple("dxilv1.7-unknown-unknown");
10171032
EXPECT_EQ(Triple::dxil, T.getArch());
1018-
EXPECT_EQ(Triple::DXILSubArch_v17, T.getSubArch());
1033+
EXPECT_EQ(Triple::DXILSubArch_v1_7, T.getSubArch());
10191034
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
10201035
EXPECT_EQ(Triple::UnknownOS, T.getOS());
10211036

10221037
T = Triple("dxilv1.8-unknown-unknown");
10231038
EXPECT_EQ(Triple::dxil, T.getArch());
1024-
EXPECT_EQ(Triple::DXILSubArch_v18, T.getSubArch());
1039+
EXPECT_EQ(Triple::DXILSubArch_v1_8, T.getSubArch());
10251040
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
10261041
EXPECT_EQ(Triple::UnknownOS, T.getOS());
10271042

1028-
T = Triple("dxilv1.9-unknown-unknown");
1043+
// Check specification of unknown SubArch results in
1044+
// unknown architecture.
1045+
T = Triple("dxilv1.999-unknown-unknown");
10291046
EXPECT_EQ(Triple::UnknownArch, T.getArch());
10301047
EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
10311048
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());

0 commit comments

Comments
 (0)