llvm · bogner · Oct 17, 2025 · Sep 17, 2025 · Oct 17, 2025
diff --git a/README.md b/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

diff --git a/lib/Support/Pipeline.cpp b/lib/Support/Pipeline.cpp
@@ -138,16 +138,34 @@ 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;
+  } else if (FillValue) {
+    I.setError("'FillValue' specified without 'FillSize'");
+    return;
   }
 
   // single buffer input

diff --git a/test/Basic/DescriptorSets.test b/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

diff --git a/test/Basic/Mandelbrot.test b/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

diff --git a/test/Basic/matrix_m-based_getter.test b/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 ]

diff --git a/test/Basic/matrix_one-based_getter.test b/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 ]

diff --git a/test/Basic/matrix_scalar_arithmetic.test b/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

diff --git a/test/Basic/matrix_scalar_constructor.test b/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 ]

diff --git a/test/Basic/simple.test b/test/Basic/simple.test
@@ -21,7 +21,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In

diff --git a/test/Bugs/UAV-Sequental-Consistency.yaml b/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

diff --git a/test/Feature/Attributes/IfBranchAttr.test b/test/Feature/Attributes/IfBranchAttr.test
@@ -24,7 +24,7 @@ Buffers:
     Data: [ 1, 4, 9, 16, 25, 36, 49, 64]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 32
+    FillSize: 32
 DescriptorSets:
   - Resources:
     - Name: In

diff --git a/test/Feature/Attributes/IfBranchFlatten.test b/test/Feature/Attributes/IfBranchFlatten.test
@@ -24,7 +24,7 @@ Buffers:
     Data: [ 1, 4, 9, 16, 25, 36, 49, 64]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 32
+    FillSize: 32
 DescriptorSets:
   - Resources:
     - Name: In

diff --git a/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test b/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test
@@ -58,11 +58,11 @@ Buffers:
 
   - Name: OutBuf
     Format: Hex32
-    ZeroInitSize: 64
+    FillSize: 64
 
   - Name: MappedBuf
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
 
 DescriptorSets:
   - Resources:

diff --git a/test/Feature/ByteAddressBuffer/GetDimensions.test b/test/Feature/ByteAddressBuffer/GetDimensions.test
@@ -39,7 +39,7 @@ Buffers:
 
   - Name: Out
     Format: Int32
-    ZeroInitSize: 8
+    FillSize: 8
 
   - Name: ExpectedOut
     Format: Int32

diff --git a/test/Feature/CBuffer/array-vec-index.test b/test/Feature/CBuffer/array-vec-index.test
@@ -27,7 +27,7 @@ Buffers:
     ]
   - Name: Out
     Format: UInt32
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: ExpectedOut
     Format: UInt32
     Data: [ 8, 11 ]

diff --git a/test/Feature/CBuffer/arrays-16bit.test b/test/Feature/CBuffer/arrays-16bit.test
@@ -45,7 +45,7 @@ Buffers:
     # Warp doesn't seem to like buffers with non-multiple of 4 strides, so we
     # add a small amount of buffer at the end here.
     Stride: 28
-    ZeroInitSize: 28
+    FillSize: 28
   - Name: ExpectedOut
     Format: Hex16
     Stride: 26

diff --git a/test/Feature/CBuffer/arrays-64bit.test b/test/Feature/CBuffer/arrays-64bit.test
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out
     Format: Hex64
     Stride: 128
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut
     Format: Hex64
     Stride: 128

diff --git a/test/Feature/CBuffer/arrays.test b/test/Feature/CBuffer/arrays.test
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 128
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut
     Format: Hex32
     Stride: 128

diff --git a/test/Feature/CBuffer/scalars-16bit.test b/test/Feature/CBuffer/scalars-16bit.test
@@ -36,7 +36,7 @@ Buffers:
     Format: Hex16
     # Warp doesn't seem to be able to handle a stride of 6 so we use 8 here...
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
 DescriptorSets:
   - Resources:
     - Name: CBScalars

diff --git a/test/Feature/CBuffer/scalars-64bit.test b/test/Feature/CBuffer/scalars-64bit.test
@@ -35,7 +35,7 @@ Buffers:
   - Name: Out
     Format: Hex64
     Stride: 24
-    ZeroInitSize: 24
+    FillSize: 24
 DescriptorSets:
   - Resources:
     - Name: CBScalars

diff --git a/test/Feature/CBuffer/scalars.test b/test/Feature/CBuffer/scalars.test
@@ -36,7 +36,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 12
-    ZeroInitSize: 12
+    FillSize: 12
 DescriptorSets:
   - Resources:
     - Name: CBScalars

diff --git a/test/Feature/CBuffer/structs.test b/test/Feature/CBuffer/structs.test
@@ -78,7 +78,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 60
-    ZeroInitSize: 60
+    FillSize: 60
 DescriptorSets:
   - Resources:
     - Name: CBVectors

diff --git a/test/Feature/CBuffer/vectors-16bit.test b/test/Feature/CBuffer/vectors-16bit.test
@@ -37,7 +37,7 @@ Buffers:
     Format: Hex16
     # Warp doesn't seem to be able to handle a stride of 10 so we use 12 here
     Stride: 12
-    ZeroInitSize: 12
+    FillSize: 12
 DescriptorSets:
   - Resources:
     - Name: CBVectors

diff --git a/test/Feature/CBuffer/vectors-64bit.test b/test/Feature/CBuffer/vectors-64bit.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out
     Format: Hex64
     Stride: 72
-    ZeroInitSize: 72
+    FillSize: 72
 DescriptorSets:
   - Resources:
     - Name: CBVectors

diff --git a/test/Feature/CBuffer/vectors.test b/test/Feature/CBuffer/vectors.test
@@ -44,7 +44,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 52
-    ZeroInitSize: 52
+    FillSize: 52
 DescriptorSets:
   - Resources:
     - Name: CBVectors

diff --git a/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test b/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
@@ -22,7 +22,7 @@ Buffers:
   - Name: Out0
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: UInt32
     Stride: 16

diff --git a/test/Feature/HLSLLib/abs.32.test b/test/Feature/HLSLLib/abs.32.test
@@ -52,23 +52,23 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
     Data: [1, 0, -2147483648, 2147483647, 1, 0, -2147483648, 2147483647, 1, 0, 0, 0] # Last two are filler
   - Name: Out2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48 
+    FillSize: 48
   - Name: ExpectedOut2 # The result we expect
     Format: UInt32
     Stride: 16
     Data: [1, 4294967295, 0, 10, 1, 4294967295, 0, 10, 1, 4294967295, 0, 0] # Last two are filler
   - Name: Out3
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48 
+    FillSize: 48
   - Name: ExpectedOut3 # The result we expect
     Format: Float32
     Stride: 16

diff --git a/test/Feature/HLSLLib/abs.fp16.test b/test/Feature/HLSLLib/abs.fp16.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out1
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1 # The result we expect
     Format: Float16
     Stride: 8

diff --git a/test/Feature/HLSLLib/abs.fp64.test b/test/Feature/HLSLLib/abs.fp64.test
@@ -27,7 +27,7 @@ Buffers:
   - Name: Out1
     Format: Float64
     Stride: 32
-    ZeroInitSize: 96
+    FillSize: 96
   - Name: ExpectedOut1 # The result we expect
     Format: Float64
     Stride: 32

diff --git a/test/Feature/HLSLLib/abs.int16.test b/test/Feature/HLSLLib/abs.int16.test
@@ -39,15 +39,15 @@ Buffers:
   - Name: Out1
     Format: Int16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1 # The result we expect
     Format: Int16
     Stride: 8
     Data: [1, 0, -32768, 32767, 1, 0, -32768, 32767, 1, 0, 0, 0] # Last two are filler
   - Name: Out2
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 24 
+    FillSize: 24
   - Name: ExpectedOut2 # The result we expect
     Format: UInt16
     Stride: 8

diff --git a/test/Feature/HLSLLib/abs.int64.test b/test/Feature/HLSLLib/abs.int64.test
@@ -39,15 +39,15 @@ Buffers:
   - Name: Out1
     Format: Int64
     Stride: 32
-    ZeroInitSize: 96
+    FillSize: 96
   - Name: ExpectedOut1 # The result we expect
     Format: Int64
     Stride: 32
     Data: [1, 0, -9223372036854775808, 9223372036854775807, 1, 0, -9223372036854775808, 9223372036854775807, 1, 0, 0, 0] # Last two are filler
   - Name: Out2
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 96 
+    FillSize: 96
   - Name: ExpectedOut2 # The result we expect
     Format: UInt64
     Stride: 32