Browse Source

No more ir sensitive compilertest (#2093)

Tests should not depend on SSA value naming/numbering. A bit of regex magic and those two last tests can now be moved to quick-test.
Tristan Labelle 6 years ago
parent
commit
103501d5f7

+ 18 - 0
tools/clang/test/CodeGenHLSL/batch/misc/matrixIn1.hlsl

@@ -0,0 +1,18 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: %[[v0x:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 0
+// CHECK: %[[v0y:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 1
+// CHECK: %[[v1x:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 0
+// CHECK: %[[v1y:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 1
+
+// fxc will generate v0.x v1.x v0.y v1.y
+
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %[[v0x]])
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %[[v1x]])
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %[[v0y]])
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %[[v1y]])
+
+float4 main(float2x2 m : M) : SV_Target
+{
+  return m;
+}

+ 18 - 0
tools/clang/test/CodeGenHLSL/batch/misc/matrixIn2.hlsl

@@ -0,0 +1,18 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: %[[v0x:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 0
+// CHECK: %[[v0y:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 1
+// CHECK: %[[v1x:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 0
+// CHECK: %[[v1y:.*]] = call float @dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 1
+
+// fxc will generate v0.xy v1.xy
+
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %[[v0x]])
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %[[v0y]])
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %[[v1x]])
+// CHECK: call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %[[v1y]])
+
+float4 main(row_major float2x2 m : M) : SV_Target
+{
+  return m;
+}

+ 0 - 18
tools/clang/test/CodeGenHLSL/matrixIn1.hlsl

@@ -1,18 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
-
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 0
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 1
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 0
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 1
-
-// fxc will generate v0.x v1.x v0.y v1.y
-
-// CHECK: float %0)
-// CHECK: float %2)
-// CHECK: float %1)
-// CHECK: float %3)
-
-float4 main(float2x2 m : M) : SV_Target
-{
-  return m;
-}

+ 0 - 18
tools/clang/test/CodeGenHLSL/matrixIn2.hlsl

@@ -1,18 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
-
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 0
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 0, i8 1
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 0
-// CHECK: dx.op.loadInput.f32(i32 4, i32 0, i32 1, i8 1
-
-// fxc will generate v0.xy v1.xy
-
-// CHECK: float %0)
-// CHECK: float %1)
-// CHECK: float %2)
-// CHECK: float %3)
-
-float4 main(row_major float2x2 m : M) : SV_Target
-{
-  return m;
-}

+ 0 - 12
tools/clang/unittests/HLSL/CompilerTest.cpp

@@ -280,8 +280,6 @@ public:
   TEST_METHOD(CodeGenLibNoAlias)
   TEST_METHOD(CodeGenLibNoAlias)
   TEST_METHOD(CodeGenLibResource)
   TEST_METHOD(CodeGenLibResource)
   TEST_METHOD(CodeGenLibUnusedFunc)
   TEST_METHOD(CodeGenLibUnusedFunc)
-  TEST_METHOD(CodeGenMatIn1)
-  TEST_METHOD(CodeGenMatIn2)
   TEST_METHOD(CodeGenMultiUAVLoad2)
   TEST_METHOD(CodeGenMultiUAVLoad2)
   TEST_METHOD(CodeGenMultiUAVLoad4)
   TEST_METHOD(CodeGenMultiUAVLoad4)
   TEST_METHOD(CodeGenMultiUAVLoad5)
   TEST_METHOD(CodeGenMultiUAVLoad5)
@@ -2529,16 +2527,6 @@ TEST_F(CompilerTest, CodeGenLibUnusedFunc) {
   CodeGenTestCheck(L"lib_unused_func.hlsl");
   CodeGenTestCheck(L"lib_unused_func.hlsl");
 }
 }
 
 
-TEST_F(CompilerTest, CodeGenMatIn1) {
-  if (m_ver.SkipIRSensitiveTest()) return;
-  CodeGenTestCheck(L"matrixIn1.hlsl");
-}
-
-TEST_F(CompilerTest, CodeGenMatIn2) {
-  if (m_ver.SkipIRSensitiveTest()) return;
-  CodeGenTestCheck(L"matrixIn2.hlsl");
-}
-
 TEST_F(CompilerTest, CodeGenMultiUAVLoad2) {
 TEST_F(CompilerTest, CodeGenMultiUAVLoad2) {
   if (m_ver.SkipDxilVersion(1,1)) return;
   if (m_ver.SkipDxilVersion(1,1)) return;
   CodeGenTestCheck(L"multiUAVLoad2.hlsl");
   CodeGenTestCheck(L"multiUAVLoad2.hlsl");