[linux-port] Enable ValidationTest for Unix (#1468)

Cast negative char literals. Fix capitalization of various shader
files. Add FileCheckerTest and FileCheckForTest to the build. These
are utility files in spite of the *Test suffix on one that enable
running tests according to header comment instructions and testing
results automaticlaly, which ValidationTest and other tests still to
come make use of.

* Fix out-of-scope access of warning messages

ValidationTest would sometimes fail in release builds because the
warning message which needed to match what was expected was being
communicated through a reference that was to a Twine object created
as a result of a C string passed to an argument taking Twine, when
the function exited, the temporary Twine was out of scope. It often
had the same values anyway, but not always.

By creating a new Twine object with the scope of the calling function
body, it sticks around long enough to pass its information into the
DiagnosticPrinter object. The warning message matches and the test
passes.

lib/Bitcode/Reader/BitcodeReader.cpp

@@ -428,8 +428,9 @@ static DiagnosticHandlerFunction getDiagHandler(DiagnosticHandlerFunction F,
 
 // HLSL Change Starts
 static void ReportWarning(DiagnosticHandlerFunction F, const char *Msg) {
+  Twine tmsg(Msg);
   BitcodeDiagnosticInfo BDI(std::error_code(), DiagnosticSeverity::DS_Warning,
-                            Msg);
+                            tmsg);
   F(BDI);
 }
 // HLSL Change Ends

tools/clang/unittests/HLSL/CMakeLists.txt

@@ -64,8 +64,6 @@ set(HLSL_IGNORE_SOURCES
   DxilModuleTest.cpp
   ExecutionTest.cpp
   ExtensionTest.cpp
-  FileCheckerTest.cpp
-  FileCheckForTest.cpp
   FunctionTest.cpp
   LinkerTest.cpp
   MSFileSysTest.cpp
@@ -73,17 +71,19 @@ set(HLSL_IGNORE_SOURCES
   RewriterTest.cpp
   ShaderOpTest.cpp
   SystemValueTest.cpp
-  ValidationTest.cpp
   )
 
 add_clang_unittest(clang-hlsl-tests
   AllocatorTest.cpp
   DxcTestUtils.cpp
   DXIsenseTest.cpp
+  FileCheckerTest.cpp
+  FileCheckForTest.cpp
   HLSLTestOptions.cpp
   Objects.cpp
   OptimizerTest.cpp
   TestMain.cpp
+  ValidationTest.cpp
   VerifierTest.cpp
   )
 

tools/clang/unittests/HLSL/FileCheckerTest.cpp

@@ -20,10 +20,11 @@
 #include <algorithm>
 #include "dxc/Support/WinIncludes.h"
 #include "dxc/dxcapi.h"
+#ifdef _WIN32
 #include <atlfile.h>
+#endif
 
 #include "HLSLTestData.h"
-#include "WexTestClass.h"
 #include "HlslTestUtils.h"
 #include "DxcTestUtils.h"
 

tools/clang/unittests/HLSL/ValidationTest.cpp

@@ -18,19 +18,23 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "dxc/HLSL/DxilContainer.h"
 
+#ifdef _WIN32
 #include <atlbase.h>
+#endif
 #include "dxc/Support/Global.h"
 #include "dxc/Support/FileIOHelper.h"
 
-#include "WexTestClass.h"
 #include "DxcTestUtils.h"
 #include "HlslTestUtils.h"
 
 using namespace std;
 using namespace hlsl;
 
-class ValidationTest
-{
+#ifdef _WIN32
+class ValidationTest {
+#else
+class ValidationTest : public ::testing::Test {
+#endif
 public:
   BEGIN_TEST_CLASS(ValidationTest)
     TEST_CLASS_PROPERTY(L"Parallel", L"true")
@@ -449,7 +453,7 @@ public:
       pProgram2 = pProgram1;
     }
 
-    // construct container with moudle from pProgram1 with other parts from pProgram2:
+    // construct container with module from pProgram1 with other parts from pProgram2:
     const DxilContainerHeader *pHeader1 = IsDxilContainerLike(pProgram1->GetBufferPointer(), pProgram1->GetBufferSize());
     VERIFY_IS_NOT_NULL(pHeader1);
     const DxilContainerHeader *pHeader2 = IsDxilContainerLike(pProgram2->GetBufferPointer(), pProgram2->GetBufferSize());
@@ -530,7 +534,7 @@ TEST_F(ValidationTest, WhenMisalignedThenFail) {
 TEST_F(ValidationTest, WhenEmptyFileThenFail) {
   // No blocks after signature.
   const char blob[] = {
-    'B', 'C', 0xc0, 0xde
+    'B', 'C', (char)0xc0, (char)0xde
   };
   CheckValidationMsgs(blob, _countof(blob), "Malformed IR file");
 }
@@ -538,21 +542,21 @@ TEST_F(ValidationTest, WhenEmptyFileThenFail) {
 TEST_F(ValidationTest, WhenIncorrectMagicThenFail) {
   // Signature isn't 'B', 'C', 0xC0 0xDE
   const char blob[] = {
-    'B', 'C', 0xc0, 0xdd
+    'B', 'C', (char)0xc0, (char)0xdd
   };
   CheckValidationMsgs(blob, _countof(blob), "Invalid bitcode signature");
 }
 
 TEST_F(ValidationTest, WhenIncorrectTargetTripleThenFail) {
   const char blob[] = {
-    'B', 'C', 0xc0, 0xde
+    'B', 'C', (char)0xc0, (char)0xde
   };
   CheckValidationMsgs(blob, _countof(blob), "Malformed IR file");
 }
 
 TEST_F(ValidationTest, WhenMultipleModulesThenFail) {
   const char blob[] = {
-    'B', 'C', 0xc0, 0xde,
+    'B', 'C', (char)0xc0, (char)0xde,
     0x21, 0x0c, 0x00, 0x00, // Enter sub-block, BlockID = 8, Code Size=3, padding x2
     0x00, 0x00, 0x00, 0x00, // NumWords = 0
     0x08, 0x00, 0x00, 0x00, // End-of-block, padding
@@ -566,7 +570,7 @@ TEST_F(ValidationTest, WhenMultipleModulesThenFail) {
 TEST_F(ValidationTest, WhenUnexpectedEOFThenFail) {
   // Importantly, this is testing the usage of report_fatal_error during deserialization.
   const char blob[] = {
-    'B', 'C', 0xc0, 0xde,
+    'B', 'C', (char)0xc0, (char)0xde,
     0x21, 0x0c, 0x00, 0x00, // Enter sub-block, BlockID = 8, Code Size=3, padding x2
     0x00, 0x00, 0x00, 0x00, // NumWords = 0
   };
@@ -575,7 +579,7 @@ TEST_F(ValidationTest, WhenUnexpectedEOFThenFail) {
 
 TEST_F(ValidationTest, WhenUnknownBlocksThenFail) {
   const char blob[] = {
-    'B', 'C', 0xc0, 0xde,   // Signature
+    'B', 'C', (char)0xc0, (char)0xde,   // Signature
     0x31, 0x00, 0x00, 0x00  // Enter sub-block, BlockID != 8
   };
   CheckValidationMsgs(blob, _countof(blob), "Unrecognized block found");
@@ -694,7 +698,7 @@ TEST_F(ValidationTest, DeadLoopFail) {
 }
 TEST_F(ValidationTest, EvalFail) {
   RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\Eval.hlsl", "ps_6_0",
+      L"..\\CodeGenHLSL\\eval.hlsl", "ps_6_0",
       "!\"A\", i8 9, i8 0, !([0-9]+), i8 2, i32 1, i8 4",
       "!\"A\", i8 9, i8 0, !\\1, i8 0, i32 1, i8 4",
       "Interpolation mode on A used with eval_\\* instruction must be ",
@@ -823,7 +827,7 @@ TEST_F(ValidationTest, SampleBiasFail) {
 }
 TEST_F(ValidationTest, SamplerKindFail) {
   RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\samplerKind.hlsl", "ps_6_0",
+      L"..\\CodeGenHLSL\\SamplerKind.hlsl", "ps_6_0",
       {"uav1_UAV_2d = call %dx.types.Handle @dx.op.createHandle(i32 57, i8 1",
        "g_txDiffuse_texture_2d = call %dx.types.Handle @dx.op.createHandle(i32 57, i8 0",
        "\"g_samLinear\", i32 0, i32 0, i32 1, i32 0",
@@ -930,7 +934,7 @@ TEST_F(ValidationTest, SimpleDs1Fail) {
 TEST_F(ValidationTest, SimpleGs1Fail) {
   return;   // Skip for now since this fails AssembleToContainer in PSV creation due to out of range stream index
   RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\SimpleGs1.hlsl", "gs_6_0",
+      L"..\\CodeGenHLSL\\SimpleGS1.hlsl", "gs_6_0",
       {"!{i32 1, i32 3, i32 1, i32 5, i32 1}",
        "i8 4, i32 1, i8 4, i32 2, i8 0, null}"
       },
@@ -969,7 +973,7 @@ TEST_F(ValidationTest, UndefValueFail) {
 TEST_F(ValidationTest, UpdateCounterFail) {
   if (m_ver.SkipIRSensitiveTest()) return;
   RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\UpdateCounter2.hlsl", "ps_6_0",
+      L"..\\CodeGenHLSL\\updateCounter2.hlsl", "ps_6_0",
       {"%2 = call i32 @dx.op.bufferUpdateCounter(i32 70, %dx.types.Handle %buf2_UAV_structbuf, i8 1)",
        "%3 = call i32 @dx.op.bufferUpdateCounter(i32 70, %dx.types.Handle %buf2_UAV_structbuf, i8 1)"
       },
@@ -1021,7 +1025,7 @@ TEST_F(ValidationTest, WhenMetaFlagsUsageDeclThenOK) {
 
 TEST_F(ValidationTest, GsVertexIDOutOfBound) {
   RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\SimpleGs1.hlsl", "gs_6_0",
+      L"..\\CodeGenHLSL\\SimpleGS1.hlsl", "gs_6_0",
       "dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 2, i32 0)",
       "dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 2, i32 1)", 
       "expect VertexID between 0~1, got 1");
@@ -1029,7 +1033,7 @@ TEST_F(ValidationTest, GsVertexIDOutOfBound) {
 
 TEST_F(ValidationTest, StreamIDOutOfBound) {
   RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\SimpleGs1.hlsl", "gs_6_0",
+      L"..\\CodeGenHLSL\\SimpleGS1.hlsl", "gs_6_0",
       "dx.op.emitStream(i32 97, i8 0)",
       "dx.op.emitStream(i32 97, i8 1)", 
       "expect StreamID between 0 , got 1");
@@ -1289,7 +1293,7 @@ TEST_F(ValidationTest, DsOutputSemantic) {
 
 TEST_F(ValidationTest, GsInputSemantic) {
     RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\SimpleGs1.hlsl", "gs_6_0",
+      L"..\\CodeGenHLSL\\SimpleGS1.hlsl", "gs_6_0",
       "!\"POSSIZE\", i8 9, i8 0",
       "!\"VertexID\", i8 4, i8 1",
       "Semantic 'VertexID' is invalid as gs Input");
@@ -1297,7 +1301,7 @@ TEST_F(ValidationTest, GsInputSemantic) {
 
 TEST_F(ValidationTest, GsOutputSemantic) {
     RewriteAssemblyCheckMsg(
-      L"..\\CodeGenHLSL\\SimpleGs1.hlsl", "gs_6_0",
+      L"..\\CodeGenHLSL\\SimpleGS1.hlsl", "gs_6_0",
       "!\"TEXCOORD\", i8 9, i8 0",
       "!\"VertexID\", i8 4, i8 1",
       "Semantic 'VertexID' is invalid as gs Output");