[PATCH] D123884: [HLSL][clang][Driver] Support validator version command line option.
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG73417c517644: [HLSL][clang][Driver] Support validator
version command line option. (authored by python3kgae).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D123884/new/
https://reviews.llvm.org/D123884
Files:
clang/include/clang/Basic/DiagnosticDriverKinds.td
clang/include/clang/Basic/TargetOptions.h
clang/include/clang/Driver/Options.td
clang/lib/CodeGen/CGHLSLRuntime.cpp
clang/lib/CodeGen/CGHLSLRuntime.h
clang/lib/CodeGen/CMakeLists.txt
clang/lib/CodeGen/CodeGenModule.cpp
clang/lib/CodeGen/CodeGenModule.h
clang/lib/Driver/ToolChains/Clang.cpp
clang/lib/Driver/ToolChains/HLSL.cpp
clang/lib/Driver/ToolChains/HLSL.h
clang/test/CodeGenHLSL/validator_version.hlsl
clang/unittests/Driver/ToolChainTest.cpp
Index: clang/unittests/Driver/ToolChainTest.cpp
===
--- clang/unittests/Driver/ToolChainTest.cpp
+++ clang/unittests/Driver/ToolChainTest.cpp
@@ -367,29 +367,28 @@
EXPECT_EQ(getDriverMode(Args[0], llvm::makeArrayRef(Args).slice(1)), "bar");
}
+struct SimpleDiagnosticConsumer : public DiagnosticConsumer {
+ void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
+const Diagnostic &Info) override {
+if (DiagLevel == DiagnosticsEngine::Level::Error) {
+ Errors.emplace_back();
+ Info.FormatDiagnostic(Errors.back());
+} else {
+ Msgs.emplace_back();
+ Info.FormatDiagnostic(Msgs.back());
+}
+ }
+ void clear() override {
+Msgs.clear();
+Errors.clear();
+DiagnosticConsumer::clear();
+ }
+ std::vector> Msgs;
+ std::vector> Errors;
+};
+
TEST(DxcModeTest, TargetProfileValidation) {
IntrusiveRefCntPtr DiagID(new DiagnosticIDs());
- struct SimpleDiagnosticConsumer : public DiagnosticConsumer {
-void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const Diagnostic &Info) override {
- if (DiagLevel == DiagnosticsEngine::Level::Error) {
-Errors.emplace_back();
-Info.FormatDiagnostic(Errors.back());
-Errors.back() += '\0';
- } else {
-Msgs.emplace_back();
-Info.FormatDiagnostic(Msgs.back());
-Msgs.back() += '\0';
- }
-}
-void clear() override {
- Msgs.clear();
- Errors.clear();
- DiagnosticConsumer::clear();
-}
-std::vector> Msgs;
-std::vector> Errors;
- };
IntrusiveRefCntPtr InMemoryFileSystem(
new llvm::vfs::InMemoryFileSystem);
@@ -474,7 +473,8 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 1u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : pss_6_1");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(),
+ "invalid profile : pss_6_1");
Diags.Clear();
DiagConsumer->clear();
@@ -483,7 +483,7 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 2u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : ps_6_x");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(), "invalid profile : ps_6_x");
Diags.Clear();
DiagConsumer->clear();
@@ -492,7 +492,8 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 3u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : lib_6_1");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(),
+ "invalid profile : lib_6_1");
Diags.Clear();
DiagConsumer->clear();
@@ -501,7 +502,110 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 4u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : foo");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(), "invalid profile : foo");
+ Diags.Clear();
+ DiagConsumer->clear();
+}
+
+TEST(DxcModeTest, ValidatorVersionValidation) {
+ IntrusiveRefCntPtr DiagID(new DiagnosticIDs());
+
+ IntrusiveRefCntPtr InMemoryFileSystem(
+ new llvm::vfs::InMemoryFileSystem);
+
+ InMemoryFileSystem->addFile("foo.hlsl", 0,
+ llvm::MemoryBuffer::getMemBuffer("\n"));
+
+ auto *DiagConsumer = new SimpleDiagnosticConsumer;
+ IntrusiveRefCntPtr DiagOpts = new DiagnosticOptions();
+ DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagConsumer);
+ Driver TheDriver("/bin/clang", "", Diags, "", InMemoryFileSystem);
+ std::unique_ptr C(
+ TheDriver.BuildCompilation({"clang", "--driver-mode=dxc", "foo.hlsl"}));
+ EXPECT_TRUE(C);
+ EXPECT_TRUE(!C->containsError());
+
+ auto &TC = C->getDefaultToolChain();
+ boo
[PATCH] D123884: [HLSL][clang][Driver] Support validator version command line option.
python3kgae updated this revision to Diff 426191.
python3kgae added a comment.
NO change, fix UNKNOWN REVISION when arc land.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D123884/new/
https://reviews.llvm.org/D123884
Files:
clang/include/clang/Basic/DiagnosticDriverKinds.td
clang/include/clang/Basic/TargetOptions.h
clang/include/clang/Driver/Options.td
clang/lib/CodeGen/CGHLSLRuntime.cpp
clang/lib/CodeGen/CGHLSLRuntime.h
clang/lib/CodeGen/CMakeLists.txt
clang/lib/CodeGen/CodeGenModule.cpp
clang/lib/CodeGen/CodeGenModule.h
clang/lib/Driver/ToolChains/Clang.cpp
clang/lib/Driver/ToolChains/HLSL.cpp
clang/lib/Driver/ToolChains/HLSL.h
clang/test/CodeGenHLSL/validator_version.hlsl
clang/unittests/Driver/ToolChainTest.cpp
Index: clang/unittests/Driver/ToolChainTest.cpp
===
--- clang/unittests/Driver/ToolChainTest.cpp
+++ clang/unittests/Driver/ToolChainTest.cpp
@@ -367,29 +367,28 @@
EXPECT_EQ(getDriverMode(Args[0], llvm::makeArrayRef(Args).slice(1)), "bar");
}
+struct SimpleDiagnosticConsumer : public DiagnosticConsumer {
+ void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
+const Diagnostic &Info) override {
+if (DiagLevel == DiagnosticsEngine::Level::Error) {
+ Errors.emplace_back();
+ Info.FormatDiagnostic(Errors.back());
+} else {
+ Msgs.emplace_back();
+ Info.FormatDiagnostic(Msgs.back());
+}
+ }
+ void clear() override {
+Msgs.clear();
+Errors.clear();
+DiagnosticConsumer::clear();
+ }
+ std::vector> Msgs;
+ std::vector> Errors;
+};
+
TEST(DxcModeTest, TargetProfileValidation) {
IntrusiveRefCntPtr DiagID(new DiagnosticIDs());
- struct SimpleDiagnosticConsumer : public DiagnosticConsumer {
-void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const Diagnostic &Info) override {
- if (DiagLevel == DiagnosticsEngine::Level::Error) {
-Errors.emplace_back();
-Info.FormatDiagnostic(Errors.back());
-Errors.back() += '\0';
- } else {
-Msgs.emplace_back();
-Info.FormatDiagnostic(Msgs.back());
-Msgs.back() += '\0';
- }
-}
-void clear() override {
- Msgs.clear();
- Errors.clear();
- DiagnosticConsumer::clear();
-}
-std::vector> Msgs;
-std::vector> Errors;
- };
IntrusiveRefCntPtr InMemoryFileSystem(
new llvm::vfs::InMemoryFileSystem);
@@ -474,7 +473,8 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 1u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : pss_6_1");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(),
+ "invalid profile : pss_6_1");
Diags.Clear();
DiagConsumer->clear();
@@ -483,7 +483,7 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 2u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : ps_6_x");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(), "invalid profile : ps_6_x");
Diags.Clear();
DiagConsumer->clear();
@@ -492,7 +492,8 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 3u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : lib_6_1");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(),
+ "invalid profile : lib_6_1");
Diags.Clear();
DiagConsumer->clear();
@@ -501,7 +502,110 @@
Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 4u);
- EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : foo");
+ EXPECT_STREQ(DiagConsumer->Errors.back().c_str(), "invalid profile : foo");
+ Diags.Clear();
+ DiagConsumer->clear();
+}
+
+TEST(DxcModeTest, ValidatorVersionValidation) {
+ IntrusiveRefCntPtr DiagID(new DiagnosticIDs());
+
+ IntrusiveRefCntPtr InMemoryFileSystem(
+ new llvm::vfs::InMemoryFileSystem);
+
+ InMemoryFileSystem->addFile("foo.hlsl", 0,
+ llvm::MemoryBuffer::getMemBuffer("\n"));
+
+ auto *DiagConsumer = new SimpleDiagnosticConsumer;
+ IntrusiveRefCntPtr DiagOpts = new DiagnosticOptions();
+ DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagConsumer);
+ Driver TheDriver("/bin/clang", "", Diags, "", InMemoryFileSystem);
+ std::unique_ptr C(
+ TheDriver.BuildCompilation({"clang", "--driver-mode=dxc", "foo.hlsl"}));
+ EXPECT_TRUE(C);
+ EXPECT_TRUE(!C->containsError());
+
+ auto &TC = C->getDefaultToolChain();
+ bool ContainsError = false;
+ auto Args = TheDriver.ParseArgStrings({"-validator-version", "1.1"}, false,
+
[PATCH] D123884: [HLSL][clang][Driver] Support validator version command line option.
beanz accepted this revision. beanz added a comment. This revision is now accepted and ready to land. LGTM. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D123884/new/ https://reviews.llvm.org/D123884 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
