Browse Source

fix sign unsign comparison for wave intrinsics test (#601)

Young Kim 8 years ago
parent
commit
c110357e99

+ 3 - 3
tools/clang/unittests/HLSL/ExecutionTest.cpp

@@ -3947,8 +3947,8 @@ void ExecutionTest::WaveIntrinsicsActivePrefixTest(
   // laneIndex is used to identify lane within the wave.
   // Lane ids are not necessarily in same order as thread ids.
   struct PerThreadData {
-      int firstLaneId;
-      int laneIndex;
+      unsigned firstLaneId;
+      unsigned laneIndex;
       int mask;
       T1 input;
       T2 output;
@@ -4058,7 +4058,7 @@ void ExecutionTest::WaveIntrinsicsActivePrefixTest(
         std::vector<T2> outputList(waveData->size());
         // sort inputList and masklist by lane id. input for each lane can be computed for its group index
         for (size_t j = 0, end = waveData->size(); j < end; ++j) {
-          int laneID = waveData->at(j)->laneIndex;
+          unsigned laneID = waveData->at(j)->laneIndex;
           // ensure that each lane ID is unique and within the range
           VERIFY_IS_TRUE(0 <= laneID && laneID < waveData->size());
           VERIFY_IS_TRUE(maskList.at(laneID) == -1);

+ 42 - 42
tools/clang/unittests/HLSL/ShaderOpArithTable.xml

@@ -2409,8 +2409,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -2454,8 +2454,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -2499,8 +2499,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -2549,8 +2549,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -2599,8 +2599,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -2655,8 +2655,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -2701,8 +2701,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         bool input;
                         bool output;
@@ -2744,8 +2744,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         bool input;
                         bool output;
@@ -2799,8 +2799,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -2844,8 +2844,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -2889,8 +2889,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -2934,8 +2934,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -2985,8 +2985,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -3041,8 +3041,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -3097,8 +3097,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -3164,8 +3164,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -3215,8 +3215,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -3263,8 +3263,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         int input;
                         int output;
@@ -3322,8 +3322,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -3370,8 +3370,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;
@@ -3417,8 +3417,8 @@
             <Parameter Name="ShaderOp.Text">
                 <![CDATA[
                     struct PerThreadData {
-                        int firstLaneId;
-                        int laneIndex;
+                        uint firstLaneId;
+                        uint laneIndex;
                         int mask;
                         uint input;
                         uint output;