Replace ZeroInit with Fill (#474)

Changes "ZeroInitSize" into "FillSize" and introduces "FillValue" to
make it possible to fill a buffer with a value other than zero.

Author: bogner

README.md

@@ -88,15 +88,16 @@ Buffers:
   - Name: Out1 # Buffer where our output will go
     Format: Float32
     Stride: 4
-    ZeroInitSize: 8
+    FillSize: 8
+    FillValue: 0.0 # The FillValue is optional and defaults to zero
   - Name: Expected1 # Buffer which stores the expected result of our test
     Format: Float32
     Stride: 4
     Data: [ 0.0, 1.0 ]
   - Name: Out2 # Buffer where our output will go
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4 # ZeroInitSize needs to be 4 bytes minimum
+    FillSize: 4 # FillSize needs to be 4 bytes minimum
   - Name: Expected2 # Buffer which stores the expected result of our test
     Format: Float16
     Stride: 2

lib/Support/Pipeline.cpp

@@ -138,17 +138,36 @@ template <typename T> static void setData(IO &I, offloadtest::Buffer &B) {
     return;
   }
 
-  // zero-initialized buffer(s)
-  int64_t ZeroInitSize;
-  I.mapOptional("ZeroInitSize", ZeroInitSize, 0);
-  if (ZeroInitSize > 0) {
-    B.Size = ZeroInitSize;
+  // Buffers can be initialized to be filled with a fixed value.
+  int64_t FillSize;
+
+  // Explicitly reject ZeroInitSize to avoid a confusing error while
+  // transitioning to FillSize. We can remove this once in flight PRs have had
+  // time to go in.
+  I.mapOptional("ZeroInitSize", FillSize, 0);
+  if (FillSize > 0) {
+    I.setError("invalid key 'ZeroInitSize' - did you mean 'FillSize'?");
+    return;
+  }
+
+  T FillValue;
+  I.mapOptional("FillSize", FillSize, 0);
+  I.mapOptional("FillValue", FillValue, T{});
+  if (FillSize > 0) {
+    B.Size = FillSize;
+    llvm::SmallVector<T> FillData(FillSize);
+    std::fill(FillData.begin(), FillData.end(), FillValue);
+
     for (uint32_t I = 0; I < B.ArraySize; I++) {
       B.Data.push_back(std::make_unique<char[]>(B.Size));
-      memset(B.Data.back().get(), 0, B.Size);
+      memcpy(B.Data.back().get(), FillData.data(), B.Size);
     }
     return;
   }
+  if (FillValue) {
+    I.setError("'FillValue' specified without 'FillSize'");
+    return;
+  }
 
   // single buffer input
   if (B.ArraySize == 1) {

test/Basic/DescriptorSets.test

@@ -23,11 +23,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In

test/Basic/Mandelbrot.test

@@ -62,7 +62,7 @@ Buffers:
   - Name: Tex
     Format: Float32
     Channels: 4
-    ZeroInitSize: 268435456 # 1024 * 1024 * 4 channels / pixel * 4 bytes / channel
+    FillSize: 268435456 # 1024 * 1024 * 4 channels / pixel * 4 bytes / channel
     OutputProps:
       Height: 4096
       Width: 4096

test/Basic/matrix_m-based_getter.test

@@ -50,7 +50,7 @@ Buffers:
     Data: [ 1, 2, 3, 4]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: Int32
     Data: [ 1, 2, 3, 4 ]

test/Basic/matrix_one-based_getter.test

@@ -52,7 +52,7 @@ Buffers:
     Data: [ 1, 2, 3, 4]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: Int32
     Data: [ 1, 2, 3, 4 ]

test/Basic/matrix_scalar_arithmetic.test

@@ -32,16 +32,16 @@ Buffers:
     Data: [ 2, 4, 6, 8, 10, 12 ]
   - Name: DivOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: MulOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: AddOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: SubOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
 DescriptorSets:
   - Resources:
     - Name: In

test/Basic/matrix_scalar_constructor.test

@@ -5,9 +5,9 @@ RWBuffer<int> Out : register(u1);
 
 [numthreads(6,1,1)]
 void main(uint GI : SV_GroupIndex) {
-  int2x3 A = int2x3(In[0], In[1], In[2], 
-                    In[3], In[4], In[5]); 
-  
+  int2x3 A = int2x3(In[0], In[1], In[2],
+                    In[3], In[4], In[5]);
+
   int row = GI / 2;
   int col = GI % 2;
   Out[GI] = A[col][row];
@@ -26,7 +26,7 @@ Buffers:
     Data: [ 1, 2, 3, 4, 5, 6]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Int32
     Data: [ 1, 4, 2, 5, 3, 6 ]

test/Basic/simple.test

@@ -21,7 +21,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In

test/Bugs/UAV-Sequental-Consistency.yaml

@@ -27,7 +27,7 @@ Buffers:
   - Name: Result
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult
     Format: Int32
     Stride: 4