adding single element access test

Author: joaosaffran

tools/clang/unittests/HLSLExec/LongVectorOps.def

@@ -61,8 +61,8 @@ OP(Bitwise, FirstBitLow, 1, "firstbitlow", "", "", "LongVectorOp", Bitwise, Defa
 
 OP_DEFAULT_DEFINES(Unary, Initialize, 1, "TestInitialize", "",
                    " -DFUNC_INITIALIZE=1")
-OP_DEFAULT_DEFINES(Unary, ArrayOperator, 1, "TestArrayOperator", "",
-                   " -DFUNC_ARRAY_OPERATOR=1")
+OP_DEFAULT_DEFINES(Unary, ArrayOperator_SingleAccess, 1, "TestArrayOperatorSingleAccess", "",
+                   " -DFUNC_ARRAY_OPERATOR_SINGLE_ACCESS=1")
 
 
 #define OP_CAST_DEFAULT(GROUP, SYMBOL)                                         \

tools/clang/unittests/HLSLExec/LongVectors.cpp

@@ -769,24 +769,16 @@ BITWISE_OP(OpType::FirstBitLow, (FirstBitLow(A)));
 DEFAULT_OP_1(OpType::Initialize, (A));
 
 template <typename T>
-struct Op<OpType::ArrayOperator, T, 1> : DefaultValidation<T> {};
+struct Op<OpType::ArrayOperator_SingleAccess, T, 1> : DefaultValidation<T> {};
 
-template <typename T> struct ExpectedBuilder<OpType::ArrayOperator, T> {
-  static std::vector<T> buildExpected(Op<OpType::ArrayOperator, T, 1>,
+template <typename T> struct ExpectedBuilder<OpType::ArrayOperator_SingleAccess, T> {
+  static std::vector<T> buildExpected(Op<OpType::ArrayOperator_SingleAccess, T, 1>,
                                       const InputSets<T> &Inputs) {
     DXASSERT_NOMSG(Inputs.size() == 1);
     const size_t VectorSize = Inputs[0].size();
-    std::vector<T> Expected;
-    Expected.resize(VectorSize * 2);
-    for (size_t I = 0; I < VectorSize; ++I) {
-      // Writing the index and value into expected data.
-      // Expected[I] = I;
-      Expected[I] = Inputs[0][I];
-
-      // Reading the index and value from the previously written data,
-      // Expected[2 * VectorSize + I] = Expected[I];
-      Expected[VectorSize + I] = Expected[I];
-    }
+    std::vector<T> Expected = Inputs[0];
+    Expected[0] = Inputs[0][VectorSize - 1];
+    Expected[VectorSize - 1] = Expected[0];
     return Expected;
   }
 };
@@ -1609,25 +1601,25 @@ class DxilConf_SM69_Vectorized {
   // Unary
 
   HLK_TEST(Initialize, HLSLBool_t);
-  // HLK_TEST(ArrayOperator, HLSLBool_t);
+  HLK_TEST(ArrayOperator_SingleAccess, HLSLBool_t);
   HLK_TEST(Initialize, int16_t);
-  // HLK_TEST(ArrayOperator, int16_t);
+  HLK_TEST(ArrayOperator_SingleAccess, int16_t);
   HLK_TEST(Initialize, int32_t);
-  HLK_TEST(ArrayOperator, int32_t);
+  HLK_TEST(ArrayOperator_SingleAccess, int32_t);
   HLK_TEST(Initialize, int64_t);
-  // HLK_TEST(ArrayOperator, int64_t);
+  HLK_TEST(ArrayOperator_SingleAccess, int64_t);
   HLK_TEST(Initialize, uint16_t);
-  // HLK_TEST(ArrayOperator, uint16_t);
+  HLK_TEST(ArrayOperator_SingleAccess, uint16_t);
   HLK_TEST(Initialize, uint32_t);
-  // HLK_TEST(ArrayOperator, uint32_t);
+  HLK_TEST(ArrayOperator_SingleAccess, uint32_t);
   HLK_TEST(Initialize, uint64_t);
-  // HLK_TEST(ArrayOperator, uint64_t);
+  HLK_TEST(ArrayOperator_SingleAccess, uint64_t);
   HLK_TEST(Initialize, HLSLHalf_t);
-  // HLK_TEST(ArrayOperator, HLSLHalf_t);
+  HLK_TEST(ArrayOperator_SingleAccess, HLSLHalf_t);
   HLK_TEST(Initialize, float);
-  HLK_TEST(ArrayOperator, float);
+  HLK_TEST(ArrayOperator_SingleAccess, float);
   HLK_TEST(Initialize, double);
-  // HLK_TEST(ArrayOperator, double);
+  HLK_TEST(ArrayOperator_SingleAccess, double);
 
   HLK_TEST(ShuffleVector, HLSLBool_t);
   HLK_TEST(ShuffleVector, int16_t);

tools/clang/unittests/HLSLExec/ShaderOpArith.xml

@@ -3985,7 +3985,7 @@ void MSMain(uint GID : SV_GroupIndex,
     <Resource Name="InputVector1" Dimension="BUFFER" Width="8192" Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST" TransitionTo="UNORDERED_ACCESS" Init="ByName" ReadBack="true" />
     <Resource Name="InputVector2" Dimension="BUFFER" Width="8192" Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST" TransitionTo="UNORDERED_ACCESS" Init="ByName" ReadBack="true" />
     <Resource Name="InputVector3" Dimension="BUFFER" Width="8192" Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST" TransitionTo="UNORDERED_ACCESS" Init="ByName" ReadBack="true" />
-    <Resource Name="OutputVector" Dimension="BUFFER" Width="8192"
+    <Resource Name="OutputVector" Dimension="BUFFER" Width="16384"
     Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST"
     TransitionTo="UNORDERED_ACCESS" Init="ByName" ReadBack="true" />
     <RootValues>
@@ -4129,15 +4129,11 @@ void MSMain(uint GID : SV_GroupIndex,
             const uint32_t OutNum = NUM;
           #endif
 
-          #if FUNC_ARRAY_OPERATOR
-            vector<TYPE, OutNum> OutputVector;
-            vector<TYPE, OutNum> ReadVector;
-            for(uint i = 0; i < NUM; i++)
-            {
-              OutputVector[i] = Input1[i];
-              ReadVector[i] = OutputVector[i];
-            }
-            g_OutputVector.Store< vector<TYPE, OutNum> >(sizeof(TYPE) * OutNum, ReadVector);
+          #if FUNC_ARRAY_OPERATOR_SINGLE_ACCESS
+            vector<OUT_TYPE, OutNum> OutputVector = g_InputVector1.Load< vector<TYPE,
+            NUM> >(0);
+            OutputVector[0] = Input1[OutNum - 1];
+            OutputVector[OutNum - 1] = OutputVector[0];
           #elif IS_UNARY_OP
             vector<OUT_TYPE, OutNum> OutputVector = FUNC(Input1);
           #elif IS_BINARY_OP