diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test
index fc3e5bcf3..f1ae21c55 100644
--- a/tests/hlsl/arithmetic-float-uniform.shader_test
+++ b/tests/hlsl/arithmetic-float-uniform.shader_test
@@ -232,24 +232,24 @@ uniform 4 double2 2.0 4.0
 uniform 8 double2 5.0 7.0
 uniform 12 double2 6.0 8.0
 todo(sm<6) draw quad
-if(sm<6) probe (0, 0) rgbaui(0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff)
-if(sm>=6) probe (0, 0) rgbaui(1, 1, 1, 1)
+if(sm<6) probe (0, 0) u32(0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff)
+if(sm>=6) probe (0, 0) u32(1, 1, 1, 1)
 
 uniform 0 double2 1.0 4.0
 uniform 4 double2 2.0 3.0
 uniform 8 double2 5.0 8.0
 uniform 12 double2 6.0 7.0
 todo(sm<6) draw quad
-if(sm<6) probe (0, 0) rgbaui(0xffffffff, 0xffffffff, 0, 0)
-if(sm>=6) probe (0, 0) rgbaui(1, 1, 0, 0)
+if(sm<6) probe (0, 0) u32(0xffffffff, 0xffffffff, 0, 0)
+if(sm>=6) probe (0, 0) u32(1, 1, 0, 0)
 
 uniform 0 double2 1.0 4.0
 uniform 4 double2 2.0 3.0
 uniform 8 double2 6.0 7.0
 uniform 12 double2 5.0 8.0
 todo(sm<6) draw quad
-if(sm<6) probe (0, 0) rgbaui(0xffffffff, 0, 0xffffffff, 0)
-if(sm>=6) probe (0, 0) rgbaui(1, 0, 1, 0)
+if(sm<6) probe (0, 0) u32(0xffffffff, 0, 0xffffffff, 0)
+if(sm>=6) probe (0, 0) u32(1, 0, 1, 0)
 
 [rtv 0]
 format r32g32b32a32-float
diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test
index b7587aa58..573d57c17 100644
--- a/tests/hlsl/arithmetic-int-uniform.shader_test
+++ b/tests/hlsl/arithmetic-int-uniform.shader_test
@@ -292,13 +292,13 @@ uniform 5 uint 2
 uniform 8 uint 2
 draw quad
 % In D3D12 with SM5 all reads to the array return 0
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(0xfffff803, 0x1ffd, 0, 0)
+if(sm>=6 | !d3d12) probe (0, 0) u32(0xfffff803, 0x1ffd, 0, 0)
 uniform 0 uint 0
 uniform 4 uint 0
 uniform 5 uint 0
 uniform 8 uint 0
 draw quad
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(1, 2, 0, 0)
+if(sm>=6 | !d3d12) probe (0, 0) u32(1, 2, 0, 0)
 
 [pixel shader]
 uniform min16int u[4];
diff --git a/tests/hlsl/arithmetic-uint.shader_test b/tests/hlsl/arithmetic-uint.shader_test
index 1c87edacb..8b74ad7e4 100644
--- a/tests/hlsl/arithmetic-uint.shader_test
+++ b/tests/hlsl/arithmetic-uint.shader_test
@@ -107,7 +107,7 @@ uint4 main() : SV_TARGET
 [test]
 uniform 0 uint4 0xccaa5533 7 1 2
 todo(msl) draw quad
-probe (0, 0) rgbaui(0xff77, 0xf, 0x407f, 0x9)
+probe (0, 0) u32(0xff77, 0xf, 0x407f, 0x9)
 
 % Minimum precision vectors in constant buffers have inconsistent behavior with
 % SM6 (see minimum-precision.shader_test), so we're reading with arrays instead.
@@ -125,11 +125,11 @@ uint4 main() : sv_target
 uniform 0 uint 0
 uniform 4 uint 0
 draw quad
-probe (0, 0) rgbaui(0xfff, 0x7ff, 0, 0)
+probe (0, 0) u32(0xfff, 0x7ff, 0, 0)
 uniform 0 uint 1
 uniform 4 uint 0xfff
 draw quad
-probe (0, 0) rgbaui(0x1000, 0x17fe, 0, 0)
+probe (0, 0) u32(0x1000, 0x17fe, 0, 0)
 
 [pixel shader]
 uniform min16uint u[2];
@@ -149,13 +149,13 @@ uniform 5 uint 2
 uniform 8 uint 2
 draw quad
 % In D3D12 with SM5 all reads to the array return 0
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(0x801, 0x1ffd, 0, 0)
+if(sm>=6 | !d3d12) probe (0, 0) u32(0x801, 0x1ffd, 0, 0)
 uniform 0 uint 0
 uniform 4 uint 0
 uniform 5 uint 0
 uniform 8 uint 0
 draw quad
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(1, 2, 0, 0)
+if(sm>=6 | !d3d12) probe (0, 0) u32(1, 2, 0, 0)
 
 [pixel shader]
 uniform min16uint u[4];
@@ -172,7 +172,7 @@ uniform 4 uint 9
 uniform 8 uint 0xff9
 uniform 12 uint 0xff7
 draw quad
-probe (0, 0) rgbaui(21, 45, 0x2feb, 0x4fd3)
+probe (0, 0) u32(21, 45, 0x2feb, 0x4fd3)
 
 [pixel shader]
 uniform min16uint u[4];
@@ -189,7 +189,7 @@ uniform 4 uint 0xb
 uniform 8 uint 0xffff
 uniform 12 uint 0xffff
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x10, 2, 0x10, 0x3333)
+probe (0, 0) u32(0x10, 2, 0x10, 0x3333)
 
 [require]
 shader model >= 6.2
@@ -207,10 +207,10 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint4 0 0 0 0
 draw quad
-probe (0, 0) rgbaui(0x7fff, 0xffff, 0, 0)
+probe (0, 0) u32(0x7fff, 0xffff, 0, 0)
 uniform 0 uint4 0xffff0001 0 0 0
 draw quad
-probe (0, 0) rgbaui(0x8000, 0xfffe, 0, 0)
+probe (0, 0) u32(0x8000, 0xfffe, 0, 0)
 
 [pixel shader]
 uniform uint16_t4 u;
@@ -225,10 +225,10 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint4 0xfffe0002 0 2 0
 draw quad
-probe (0, 0) rgbaui(0x8001, 0xfffd, 0, 0)
+probe (0, 0) u32(0x8001, 0xfffd, 0, 0)
 uniform 0 uint4 0 0 0 0
 draw quad
-probe (0, 0) rgbaui(1, 2, 0, 0)
+probe (0, 0) u32(1, 2, 0, 0)
 
 [pixel shader]
 uniform uint16_t4 u;
@@ -243,7 +243,7 @@ uint4 main() : sv_target
 uniform 0 uint 0x90007
 uniform 1 uint 0xfff7fff9
 draw quad
-probe (0, 0) rgbaui(21, 45, 0xffeb, 0xffd3)
+probe (0, 0) u32(21, 45, 0xffeb, 0xffd3)
 
 [pixel shader]
 uniform uint16_t4 u;
@@ -258,4 +258,4 @@ uint4 main() : sv_target
 uniform 0 uint 0x000bfffe
 uniform 1 uint 0xffffffff
 draw quad
-probe (0, 0) rgbaui(0, 2, 1, 0x3333)
+probe (0, 0) u32(0, 2, 1, 0x3333)
diff --git a/tests/hlsl/barriers.shader_test b/tests/hlsl/barriers.shader_test
index 46a13a1ed..4a649d331 100644
--- a/tests/hlsl/barriers.shader_test
+++ b/tests/hlsl/barriers.shader_test
@@ -98,4 +98,4 @@ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
 
 [test]
 todo(glsl) dispatch 1 1 1
-probe uav 3 (0, 0, 1024, 1) rui(1024)
+probe uav 3 (0, 0, 1024, 1) u32(1024)
diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test
index 98b556bb8..39a54667e 100644
--- a/tests/hlsl/bitwise.shader_test
+++ b/tests/hlsl/bitwise.shader_test
@@ -227,13 +227,13 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint4 0 0 0 0
 todo(sm<6) draw quad
-probe (0, 0) rgbaui (0, 0xffffffff, 0xffffffff, 0xffffffff)
+probe (0, 0) u32(0, 0xffffffff, 0xffffffff, 0xffffffff)
 uniform 0 uint4 0xffffffff 0xffffffff 0 0
 todo(sm<6) draw quad
-probe (0, 0) rgbaui (32, 0, 31, 0xffffffff)
+probe (0, 0) u32(32, 0, 31, 0xffffffff)
 uniform 0 uint4 0xcccccccc 0xcccccccc 0 0
 todo(sm<6) draw quad
-probe (0, 0) rgbaui (16, 2, 31, 29)
+probe (0, 0) u32(16, 2, 31, 29)
 
 [rtv 0]
 format r32g32b32a32-float
@@ -335,10 +335,10 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint64_t2 0 0
 todo draw quad
-probe (0, 0) rgbaui (0, 0xffffffff, 0xffffffff, 0xffffffff)
+probe (0, 0) u32(0, 0xffffffff, 0xffffffff, 0xffffffff)
 uniform 0 int64_t2 -1 -1
 todo draw quad
-probe (0, 0) rgbaui (64, 0, 63, 0xffffffff)
+probe (0, 0) u32(64, 0, 63, 0xffffffff)
 uniform 0 uint64_t2 0xcccccccccccccccc 0xcccccccccccccccc
 todo draw quad
-probe (0, 0) rgbaui (32, 2, 63, 61)
+probe (0, 0) u32(32, 2, 63, 61)
diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test
index 2b82dfcf1..c3c87797a 100644
--- a/tests/hlsl/cast-64-bit.shader_test
+++ b/tests/hlsl/cast-64-bit.shader_test
@@ -33,7 +33,7 @@ uint4 main() : sv_target
 [test]
 uniform 0 double2 -4.5 8.500003814697266
 todo(sm<6) draw quad
-probe (0, 0) rgbaui (0, 0xc0120000, 0x80000000, 0x40210000)
+probe (0, 0) u32(0, 0xc0120000, 0x80000000, 0x40210000)
 
 
 [pixel shader todo]
@@ -139,7 +139,7 @@ uint4 main() : sv_target
 [test]
 uniform 0 double2 0.5 1.0
 todo(sm<6) draw quad
-probe (0, 0) rgbaui(0, 2, 0, 1)
+probe (0, 0) u32(0, 2, 0, 1)
 
 [pixel shader todo]
 uniform min16uint u[2];
@@ -157,7 +157,7 @@ uint4 main() : sv_target
 uniform 0 uint 22
 uniform 4 uint 0xff00
 todo(sm<6) draw quad
-probe (0, 0) rgbaui(0, 0x40360000, 0, 0x40efe000)
+probe (0, 0) u32(0, 0x40360000, 0, 0x40efe000)
 
 [pixel shader todo]
 uniform min16int u[2];
@@ -175,7 +175,7 @@ uint4 main() : sv_target
 uniform 0 uint 22
 uniform 4 uint 0xffffff00
 todo(sm<6) draw quad
-probe (0, 0) rgbaui(0, 0x40360000, 0, 0xc0700000)
+probe (0, 0) u32(0, 0x40360000, 0, 0xc0700000)
 
 [require]
 shader model >= 6.2
@@ -211,7 +211,7 @@ uint4 main() : sv_target
 [test]
 uniform 0 double2 0.5 1.0
 todo draw quad
-probe (0, 0) rgbaui(0, 2, 0, 1)
+probe (0, 0) u32(0, 2, 0, 1)
 
 [pixel shader]
 uniform uint16_t2 u;
@@ -229,7 +229,7 @@ uint4 main() : sv_target
 uniform 0 uint 0xff000022
 
 draw quad
-probe (0, 0) rgbaui(0, 0x40410000, 0, 0x40efe000)
+probe (0, 0) u32(0, 0x40410000, 0, 0x40efe000)
 
 [pixel shader]
 uniform int16_t2 u;
@@ -246,4 +246,4 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint 0xff000022
 draw quad
-probe (0, 0) rgbaui(0, 0x40410000, 0, 0xc0700000)
+probe (0, 0) u32(0, 0x40410000, 0, 0xc0700000)
diff --git a/tests/hlsl/cast-to-uint.shader_test b/tests/hlsl/cast-to-uint.shader_test
index 948e66683..caf786cc6 100644
--- a/tests/hlsl/cast-to-uint.shader_test
+++ b/tests/hlsl/cast-to-uint.shader_test
@@ -65,10 +65,10 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint4 0x10002 0x8003 0x10002 0x8003
 draw quad
-probe (0, 0) rgbaui(4, 6, 2, 0x8003)
+probe (0, 0) u32(4, 6, 2, 0x8003)
 uniform 0 uint4 0xffffffff 0xfffffffd 0xffffffff 0xfffffffd
 draw quad
-probe (0, 0) rgbaui(0xfffe, 0xfffa, 0xffff, 0xfffd)
+probe (0, 0) u32(0xfffe, 0xfffa, 0xffff, 0xfffd)
 
 [pixel shader]
 uniform float4 f;
@@ -82,4 +82,4 @@ uint4 main() : sv_target
 [test]
 uniform 0 float4 0.5 1.0 0.5 1.0
 todo draw quad
-probe (0, 0) rgbaui(0, 2, 0, 1)
+probe (0, 0) u32(0, 2, 0, 1)
diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test
index f1b65a11f..92521003d 100644
--- a/tests/hlsl/cbuffer.shader_test
+++ b/tests/hlsl/cbuffer.shader_test
@@ -1022,7 +1022,7 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint 0x7fffffff
 draw quad
-probe (0, 0) rgbaui(0xffff, 0x7fff, 0, 0)
+probe (0, 0) u32(0xffff, 0x7fff, 0, 0)
 
 [pixel shader]
 uniform uint16_t4 u0;
@@ -1036,7 +1036,7 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint4 0x20001 0x40003 0x60005 0x80007
 draw quad
-probe (0, 0) rgbaui(1, 2, 6, 7)
+probe (0, 0) u32(1, 2, 6, 7)
 
 [pixel shader]
 uniform int16_t2 i;
diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test
index f09476c42..2405a2ea1 100644
--- a/tests/hlsl/coverage.shader_test
+++ b/tests/hlsl/coverage.shader_test
@@ -48,15 +48,15 @@ sample mask 0x01
 clear rtv 0 0.0 0.0 0.0 0.0
 todo(sm<6) draw quad
 probe (0, 0) rgba (0.0, 0.25, 0.0, 0.25)
-probe uav 1 (0, 0, 4, 4) rui (0x01)
+probe uav 1 (0, 0, 4, 4) u32(0x01)
 sample mask 0x03
 todo(sm<6) draw quad
 probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5)
-probe uav 1 (0, 0, 4, 4) rui (0x03)
+probe uav 1 (0, 0, 4, 4) u32(0x03)
 sample mask 0x07
 todo(sm<6) draw quad
 probe (0, 0) rgba (0.0, 0.75, 0.0, 0.75)
-probe uav 1 (0, 0, 4, 4) rui (0x07)
+probe uav 1 (0, 0, 4, 4) u32(0x07)
 
 [uav 1]
 format r32-uint
@@ -71,8 +71,8 @@ clear rtv 0 0.0 0.0 0.0 0.0
 sample mask 0x09
 todo(sm<6) draw quad
 probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5)
-probe uav 1 (0, 0, 4, 4) rui (0x09)
+probe uav 1 (0, 0, 4, 4) u32(0x09)
 sample mask 0x0f
 todo(sm<6) draw quad
 probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0)
-probe uav 1 (0, 0, 4, 4) rui (0x0f)
+probe uav 1 (0, 0, 4, 4) u32(0x0f)
diff --git a/tests/hlsl/f16tof32.shader_test b/tests/hlsl/f16tof32.shader_test
index 73b028218..066445345 100644
--- a/tests/hlsl/f16tof32.shader_test
+++ b/tests/hlsl/f16tof32.shader_test
@@ -79,9 +79,9 @@ probe (0, 0) rgba(3.0517578e-05, 3.0517578e-05, 3.0517578e-05, 3.0517578e-05)
 % positive infinity
 uniform 0 uint 0x7c00
 todo(msl) draw quad
-probe (0, 0) rgbaui(0x7f800000, 0x7f800000, 0x7f800000, 0x7f800000)
+probe (0, 0) u32(0x7f800000, 0x7f800000, 0x7f800000, 0x7f800000)
 
 % negative infinity
 uniform 0 uint 0xfc00
 todo(msl) draw quad
-probe (0, 0) rgbaui(0xff800000, 0xff800000, 0xff800000, 0xff800000)
+probe (0, 0) u32(0xff800000, 0xff800000, 0xff800000, 0xff800000)
diff --git a/tests/hlsl/f32tof16.shader_test b/tests/hlsl/f32tof16.shader_test
index 91e36fad7..141fce1b9 100644
--- a/tests/hlsl/f32tof16.shader_test
+++ b/tests/hlsl/f32tof16.shader_test
@@ -16,12 +16,12 @@ uint4 main() : sv_target
 [test]
 uniform 0 float 42.0
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x5140, 0x5140, 0x5140, 0x5140)
+probe (0, 0) u32(0x5140, 0x5140, 0x5140, 0x5140)
 
 % zero
 uniform 0 float 0.0
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x0, 0x0, 0x0, 0x0)
+probe (0, 0) u32(0x0, 0x0, 0x0, 0x0)
 
 % negative zero
 uniform 0 uint 0x8000
@@ -31,61 +31,61 @@ probe (0, 0) rgba(-0.0, -0.0, -0.0, -0.0)
 % subnormal number
 uniform 0 float 5.9604645e-08
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x1, 0x1, 0x1, 0x1)
+probe (0, 0) u32(0x1, 0x1, 0x1, 0x1)
 
 % subnormal number
 uniform 0 float 1.1920929e-07
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x2, 0x2, 0x2, 0x2)
+probe (0, 0) u32(0x2, 0x2, 0x2, 0x2)
 
 % subnormal number
 uniform 0 float 2.3841858e-07
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x4, 0x4, 0x4, 0x4)
+probe (0, 0) u32(0x4, 0x4, 0x4, 0x4)
 
 % subnormal number
 uniform 0 float 4.7683716e-07
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x8, 0x8, 0x8, 0x8)
+probe (0, 0) u32(0x8, 0x8, 0x8, 0x8)
 
 % subnormal number
 uniform 0 float 9.536743e-07
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x10, 0x10, 0x10, 0x10)
+probe (0, 0) u32(0x10, 0x10, 0x10, 0x10)
 
 % subnormal number
 uniform 0 float 1.9073486e-06
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x20, 0x20, 0x20, 0x20)
+probe (0, 0) u32(0x20, 0x20, 0x20, 0x20)
 
 % subnormal number
 uniform 0 float 3.8146973e-06
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x40, 0x40, 0x40, 0x40)
+probe (0, 0) u32(0x40, 0x40, 0x40, 0x40)
 
 % subnormal number
 uniform 0 float 7.6293945e-06
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x80, 0x80, 0x80, 0x80)
+probe (0, 0) u32(0x80, 0x80, 0x80, 0x80)
 
 % subnormal number
 uniform 0 float 1.5258789e-05
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x100, 0x100, 0x100, 0x100)
+probe (0, 0) u32(0x100, 0x100, 0x100, 0x100)
 
 % subnormal number
 uniform 0 float 3.0517578e-05
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x200, 0x200, 0x200, 0x200)
+probe (0, 0) u32(0x200, 0x200, 0x200, 0x200)
 
 % I'd love to use rgba probes here but msvc doesn't scanf infinity :(
 
 % positive infinity
 uniform 0 uint 0x7f800000
 todo(msl) draw quad
-probe (0, 0) rgbaui (0x7c00, 0x7c00, 0x7c00, 0x7c00)
+probe (0, 0) u32(0x7c00, 0x7c00, 0x7c00, 0x7c00)
 
 % negative infinity
 uniform 0 uint 0xff800000
 todo(msl) draw quad
-probe (0, 0) rgbaui (0xfc00, 0xfc00, 0xfc00, 0xfc00)
+probe (0, 0) u32(0xfc00, 0xfc00, 0xfc00, 0xfc00)
diff --git a/tests/hlsl/getdimensions.shader_test b/tests/hlsl/getdimensions.shader_test
index a87540329..06b598867 100644
--- a/tests/hlsl/getdimensions.shader_test
+++ b/tests/hlsl/getdimensions.shader_test
@@ -78,7 +78,7 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 0 (0) rui(4)
+probe uav 0 (0) u32(4)
 
 [uav 0]
 stride 6
@@ -107,8 +107,8 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 0 (0) rui(0x38000002)
-probe uav 0 (1) rui(6)
+probe uav 0 (0) u32(0x38000002)
+probe uav 0 (1) u32(6)
 
 [uav 0]
 stride 8
@@ -137,8 +137,8 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 0 (0) rui(0x38000002)
-probe uav 0 (1) rui(8)
+probe uav 0 (0) u32(0x38000002)
+probe uav 0 (1) u32(8)
 
 [uav 0]
 stride 8
@@ -166,5 +166,5 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 0 (0) rui(2)
-probe uav 0 (1) rui(8)
+probe uav 0 (0) u32(2)
+probe uav 0 (1) u32(8)
diff --git a/tests/hlsl/max-min.shader_test b/tests/hlsl/max-min.shader_test
index 3d273db4a..67ce77f5c 100644
--- a/tests/hlsl/max-min.shader_test
+++ b/tests/hlsl/max-min.shader_test
@@ -102,7 +102,7 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint4 1 2 0 0
 todo(msl) draw quad
-probe (0, 0) rgbaui (2, 1, 2, 1)
+probe (0, 0) u32(2, 1, 2, 1)
 
 [rtv 0]
 format r32g32b32a32-sint
diff --git a/tests/hlsl/minimum-precision.shader_test b/tests/hlsl/minimum-precision.shader_test
index 7ffc3afff..9dcf17709 100644
--- a/tests/hlsl/minimum-precision.shader_test
+++ b/tests/hlsl/minimum-precision.shader_test
@@ -51,7 +51,7 @@ uniform 0 uint4 0x020001 0x040003 0x060005 0x080007
 uniform 4 uint4 0x120011 0x140013 0x160015 0x180017
 uniform 8 uint4 0x220021 0x240023 0x260025 0x280027
 draw quad
-probe (0, 0) rgbaui(1, 1, 1, 1)
+probe (0, 0) u32(1, 1, 1, 1)
 
 % Minimum precision types have a funny behavior with respect to stride in SM6:
 % DXC allocates them assuming they're 32 bit, and the generated code first loads
@@ -95,7 +95,7 @@ uniform 0 uint4 0x020001 0x040003 0x060005 0x080007
 uniform 4 uint4 0x120011 0x140013 0x160015 0x180017
 uniform 8 uint4 0x220021 0x240023 0x260025 0x280027
 draw quad
-todo probe (0, 0) rgbaui(1, 1, 1, 1)
+todo probe (0, 0) u32(1, 1, 1, 1)
 
 % Same tests for signed integers
 
@@ -123,7 +123,7 @@ uniform 0 uint4 0x020001 0x040003 0x060005 0x080007
 uniform 4 uint4 0x120011 0x140013 0x160015 0x180017
 uniform 8 uint4 0x220021 0x240023 0x260025 0x280027
 draw quad
-probe (0, 0) rgbaui(1, 1, 1, 1)
+probe (0, 0) u32(1, 1, 1, 1)
 
 [require]
 shader model >= 6.0
@@ -154,7 +154,7 @@ uniform 0 uint4 0x020001 0x040003 0x060005 0x080007
 uniform 4 uint4 0x120011 0x140013 0x160015 0x180017
 uniform 8 uint4 0x220021 0x240023 0x260025 0x280027
 draw quad
-todo probe (0, 0) rgbaui(1, 1, 1, 1)
+todo probe (0, 0) u32(1, 1, 1, 1)
 
 % Same tests for floating point numbers
 
@@ -182,7 +182,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 11.0 12.0 13.0 14.0
 uniform 8 float4 21.0 22.0 23.0 24.0
 draw quad
-probe (0, 0) rgbaui(1, 1, 1, 1)
+probe (0, 0) u32(1, 1, 1, 1)
 
 [require]
 shader model >= 6.0
@@ -213,7 +213,7 @@ uniform 0 uint4 0x40003c00 0x44004200 0x46004500 0x48004700
 uniform 4 uint4 0x4a004980 0x4b004a80 0x4c004b80 0x4c804c40
 uniform 8 uint4 0x4d804d40 0x4e004dc0 0x4e804e40 0x4f004ec0
 draw quad
-todo probe (0, 0) rgbaui(1, 1, 1, 1)
+todo probe (0, 0) u32(1, 1, 1, 1)
 
 [require]
 shader model >= 4.0
@@ -237,11 +237,11 @@ uniform 0 uint 0
 uniform 1 uint 100
 draw quad
 % In D3D12 with SM5 all reads to the array return 0
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(100, 2, 0x7ff, 0xfff)
+if(sm>=6 | !d3d12) probe (0, 0) u32(100, 2, 0x7ff, 0xfff)
 uniform 0 uint 2
 uniform 1 uint 1000
 draw quad
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(1, 2, 1000, 0xfff)
+if(sm>=6 | !d3d12) probe (0, 0) u32(1, 2, 1000, 0xfff)
 
 [rtv 0]
 format r32g32b32a32-sint
@@ -263,11 +263,11 @@ uniform 0 uint 0
 uniform 1 uint 100
 draw quad
 % In D3D12 with SM5 all reads to the array return 0
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(100, 2, 0x7ff, 0xfff)
+if(sm>=6 | !d3d12) probe (0, 0) u32(100, 2, 0x7ff, 0xfff)
 uniform 0 uint 2
 uniform 1 uint 1000
 draw quad
-if(sm>=6 | !d3d12) probe (0, 0) rgbaui(1, 2, 1000, 0xfff)
+if(sm>=6 | !d3d12) probe (0, 0) u32(1, 2, 1000, 0xfff)
 
 [rtv 0]
 format r32g32b32a32-float
diff --git a/tests/hlsl/rasteriser-ordered-views.shader_test b/tests/hlsl/rasteriser-ordered-views.shader_test
index 05fe816ae..d9cf9d650 100644
--- a/tests/hlsl/rasteriser-ordered-views.shader_test
+++ b/tests/hlsl/rasteriser-ordered-views.shader_test
@@ -35,8 +35,8 @@ uint4 main(float4 pos : sv_position) : sv_target
 % Initialise the UAV and RTV.
 [test]
 todo(glsl) draw triangle list 3
-probe (0, 0) rui(0xaaaaaaaa)
-probe uav 1 (0, 0, 640, 480) rui(0x55555555)
+probe (0, 0) u32(0xaaaaaaaa)
+probe uav 1 (0, 0, 640, 480) u32(0x55555555)
 
 [pixel shader]
 RasterizerOrderedTexture2D<uint4> tex : register(u1);
@@ -68,5 +68,5 @@ rov
 
 [test]
 draw triangle list 93
-probe (0, 0) rui(0x6aaaaaaa)
-probe uav 1 (0, 0, 640, 480) rui(0x2aaaaaaa)
+probe (0, 0) u32(0x6aaaaaaa)
+probe uav 1 (0, 0, 640, 480) u32(0x2aaaaaaa)
diff --git a/tests/hlsl/rt-format-mismatch.shader_test b/tests/hlsl/rt-format-mismatch.shader_test
index d6049cd3c..b4fc507be 100644
--- a/tests/hlsl/rt-format-mismatch.shader_test
+++ b/tests/hlsl/rt-format-mismatch.shader_test
@@ -30,7 +30,7 @@ uint4 main() : sv_target
 
 [test]
 todo(mvk & vulkan | msl) draw quad
-todo(mvk) probe (0, 0) rgbaui (0, 22, 0xfeedcafe, 0xffffffff)
+todo(mvk) probe (0, 0) u32(0, 22, 0xfeedcafe, 0xffffffff)
 
 [pixel shader]
 int4 main() : sv_target
@@ -74,7 +74,7 @@ uint4 main() : sv_target
 
 [test]
 draw quad
-probe (0, 0) rgbaui (0, 22, 0xfeedcafe, 0xffffffff)
+probe (0, 0) u32(0, 22, 0xfeedcafe, 0xffffffff)
 
 [pixel shader]
 int4 main() : sv_target
@@ -118,7 +118,7 @@ uint4 main() : sv_target
 
 [test]
 todo(mvk & vulkan | msl) draw quad
-todo(mvk) probe (0, 0) rgbaui (0, 22, 0xfeedcafe, 0xffffffff)
+todo(mvk) probe (0, 0) u32(0, 22, 0xfeedcafe, 0xffffffff)
 
 [pixel shader]
 int4 main() : sv_target
@@ -162,7 +162,7 @@ uint4 main() : sv_target
 
 [test]
 draw quad
-probe (0, 0) rui (22)
+probe (0, 0) u32(22)
 
 [pixel shader]
 int4 main() : sv_target
diff --git a/tests/hlsl/srv-buffers.shader_test b/tests/hlsl/srv-buffers.shader_test
index 44b9aaf7a..8e69a3fea 100644
--- a/tests/hlsl/srv-buffers.shader_test
+++ b/tests/hlsl/srv-buffers.shader_test
@@ -241,4 +241,4 @@ uint4 main() : sv_target
 
 [test]
 draw quad
-probe (0, 0) rgbaui(0, 1, 10, 100)
+probe (0, 0) u32(0, 1, 10, 100)
diff --git a/tests/hlsl/srv-byteaddressbuffer.shader_test b/tests/hlsl/srv-byteaddressbuffer.shader_test
index ed4c7233a..3bb230db3 100644
--- a/tests/hlsl/srv-byteaddressbuffer.shader_test
+++ b/tests/hlsl/srv-byteaddressbuffer.shader_test
@@ -32,28 +32,28 @@ uint4 main() : sv_target
 [test]
 uniform 0 uint4 0 1 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x1, 0xa, 0xb, 0xc)
+probe (0, 0) u32(0x1, 0xa, 0xb, 0xc)
 uniform 0 uint4 4 1 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x2, 0xa, 0xb, 0xc)
+probe (0, 0) u32(0x2, 0xa, 0xb, 0xc)
 uniform 0 uint4 0 2 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x1, 0x2, 0xd, 0xe)
+probe (0, 0) u32(0x1, 0x2, 0xd, 0xe)
 uniform 0 uint4 4 2 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x2, 0x3, 0xd, 0xe)
+probe (0, 0) u32(0x2, 0x3, 0xd, 0xe)
 uniform 0 uint4 0 3 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x1, 0x2, 0x3, 0xf)
+probe (0, 0) u32(0x1, 0x2, 0x3, 0xf)
 uniform 0 uint4 4 3 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x2, 0x3, 0x4, 0xf)
+probe (0, 0) u32(0x2, 0x3, 0x4, 0xf)
 uniform 0 uint4 0 4 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x1, 0x2, 0x3, 0x4)
+probe (0, 0) u32(0x1, 0x2, 0x3, 0x4)
 uniform 0 uint4 4 4 0 0
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x2, 0x3, 0x4, 0x0)
+probe (0, 0) u32(0x2, 0x3, 0x4, 0x0)
 
 % Test correct emission of resource declarations in SM 5.1 format.
 [require]
@@ -75,4 +75,4 @@ uint4 main() : sv_target
 
 [test]
 todo(msl | glsl) draw quad
-probe (0, 0) rgbaui(0x4, 0x3, 0x2, 0x1)
+probe (0, 0) u32(0x4, 0x3, 0x2, 0x1)
diff --git a/tests/hlsl/tgsm.shader_test b/tests/hlsl/tgsm.shader_test
index 6be381261..ea810f759 100644
--- a/tests/hlsl/tgsm.shader_test
+++ b/tests/hlsl/tgsm.shader_test
@@ -68,10 +68,10 @@ void main(uint local_idx : SV_GroupIndex)
 
 [test]
 todo(sm<6) dispatch 1 1 1
-probe uav 0 (0) rui(0xcafef00d)
-probe uav 0 (1) rui(0xcafef00d)
-probe uav 0 (2) rui(0xcafef00d)
-probe uav 0 (3) rui(0xcafef00d)
+probe uav 0 (0) u32(0xcafef00d)
+probe uav 0 (1) u32(0xcafef00d)
+probe uav 0 (2) u32(0xcafef00d)
+probe uav 0 (3) u32(0xcafef00d)
 
 [require]
 shader model >= 5.0
@@ -100,10 +100,10 @@ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
 
 [test]
 todo(sm<6) dispatch 4 1 1
-probe uav 1 (0) rui (0)
-probe uav 1 (1) rui (33)
-probe uav 1 (2) rui (66)
-probe uav 1 (3) rui (99)
+probe uav 1 (0) u32(0)
+probe uav 1 (1) u32(33)
+probe uav 1 (2) u32(66)
+probe uav 1 (3) u32(99)
 
 
 [uav 1]
@@ -235,7 +235,7 @@ void main(uint local_idx : SV_GroupIndex)
 
 [test]
 todo(sm<6) dispatch 1 1 1
-probe uav 1 (0) rui (39)
+probe uav 1 (0) u32(39)
 
 [uav 0]
 format r32-typeless
@@ -264,14 +264,14 @@ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
 
 [test]
 todo dispatch 2 1 1
-todo probe uav 0 (0) rui(0x18)
-todo probe uav 0 (1) rui(0x18)
-todo probe uav 0 (2) rui(0x38)
-todo probe uav 0 (3) rui(0x38)
-todo probe uav 0 (4) rui(0x1a)
-todo probe uav 0 (5) rui(0x1a)
-todo probe uav 0 (6) rui(0x3a)
-todo probe uav 0 (7) rui(0x3a)
+todo probe uav 0 (0) u32(0x18)
+todo probe uav 0 (1) u32(0x18)
+todo probe uav 0 (2) u32(0x38)
+todo probe uav 0 (3) u32(0x38)
+todo probe uav 0 (4) u32(0x1a)
+todo probe uav 0 (5) u32(0x1a)
+todo probe uav 0 (6) u32(0x3a)
+todo probe uav 0 (7) u32(0x3a)
 
 [uav 0]
 format r32-typeless
@@ -306,14 +306,14 @@ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
 
 [test]
 todo dispatch 2 1 1
-todo probe uav 0 (0) rui(0x14321)
-todo probe uav 0 (1) rui(0x14321)
-todo probe uav 0 (2) rui(0x14321)
-todo probe uav 0 (3) rui(0x14321)
-todo probe uav 0 (4) rui(0x24321)
-todo probe uav 0 (5) rui(0x24321)
-todo probe uav 0 (6) rui(0x24321)
-todo probe uav 0 (7) rui(0x24321)
+todo probe uav 0 (0) u32(0x14321)
+todo probe uav 0 (1) u32(0x14321)
+todo probe uav 0 (2) u32(0x14321)
+todo probe uav 0 (3) u32(0x14321)
+todo probe uav 0 (4) u32(0x24321)
+todo probe uav 0 (5) u32(0x24321)
+todo probe uav 0 (6) u32(0x24321)
+todo probe uav 0 (7) u32(0x24321)
 
 [require]
 shader model >= 6.2
@@ -343,7 +343,7 @@ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
 
 [test]
 dispatch 2 1 1
-probe uav 1 (0) rui(0x180018)
-probe uav 1 (1) rui(0x380038)
-probe uav 1 (2) rui(0x1a001a)
-probe uav 1 (3) rui(0x3a003a)
+probe uav 1 (0) u32(0x180018)
+probe uav 1 (1) u32(0x380038)
+probe uav 1 (2) u32(0x1a001a)
+probe uav 1 (3) u32(0x3a003a)
diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test
index 9ed04e171..e15d02b0f 100644
--- a/tests/hlsl/uav-atomics.shader_test
+++ b/tests/hlsl/uav-atomics.shader_test
@@ -33,31 +33,31 @@ void main()
 [test]
 uniform 0 uint4 3 5 0 0
 todo(glsl | msl) dispatch 1 1 1
-probe uav 1 (0) rui (1)
-probe uav 1 (1) rui (3)
-probe uav 1 (2) rui (15)
-probe uav 1 (3) rui (0x13)
-probe uav 1 (4) rui (4)
-probe uav 1 (5) rui (3)
-probe uav 1 (6) rui (4)
-probe uav 1 (7) rui (3)
-probe uav 1 (8) rui (1)
-probe uav 1 (9) rui (3)
-probe uav 1 (10) rui (1)
+probe uav 1 (0) u32(1)
+probe uav 1 (1) u32(3)
+probe uav 1 (2) u32(15)
+probe uav 1 (3) u32(0x13)
+probe uav 1 (4) u32(4)
+probe uav 1 (5) u32(3)
+probe uav 1 (6) u32(4)
+probe uav 1 (7) u32(3)
+probe uav 1 (8) u32(1)
+probe uav 1 (9) u32(3)
+probe uav 1 (10) u32(1)
 
 uniform 0 uint4 1 2 0 0
 todo(glsl | msl) dispatch 2 1 1
-probe uav 1 (0) rui (1)
-probe uav 1 (1) rui (3)
-probe uav 1 (2) rui (21)
-probe uav 1 (3) rui (0x13)
-probe uav 1 (4) rui (4)
-probe uav 1 (5) rui (1)
-probe uav 1 (6) rui (4)
-probe uav 1 (7) rui (1)
-probe uav 1 (8) rui (1)
-probe uav 1 (9) rui (3)
-probe uav 1 (10) rui (1)
+probe uav 1 (0) u32(1)
+probe uav 1 (1) u32(3)
+probe uav 1 (2) u32(21)
+probe uav 1 (3) u32(0x13)
+probe uav 1 (4) u32(4)
+probe uav 1 (5) u32(1)
+probe uav 1 (6) u32(4)
+probe uav 1 (7) u32(1)
+probe uav 1 (8) u32(1)
+probe uav 1 (9) u32(3)
+probe uav 1 (10) u32(1)
 
 
 [uav 2]
@@ -121,17 +121,17 @@ void main()
 [test]
 uniform 0 uint4 3 5 0 0
 todo(glsl | msl) dispatch 1 1 1
-probe uav 1 (0) rui (1)
-probe uav 1 (1) rui (3)
-probe uav 1 (2) rui (15)
-probe uav 1 (3) rui (0x13)
-probe uav 1 (4) rui (4)
-probe uav 1 (5) rui (3)
-probe uav 1 (6) rui (4)
-probe uav 1 (7) rui (3)
-probe uav 1 (8) rui (1)
-probe uav 1 (9) rui (3)
-probe uav 1 (10) rui (1)
+probe uav 1 (0) u32(1)
+probe uav 1 (1) u32(3)
+probe uav 1 (2) u32(15)
+probe uav 1 (3) u32(0x13)
+probe uav 1 (4) u32(4)
+probe uav 1 (5) u32(3)
+probe uav 1 (6) u32(4)
+probe uav 1 (7) u32(3)
+probe uav 1 (8) u32(1)
+probe uav 1 (9) u32(3)
+probe uav 1 (10) u32(1)
 
 
 [compute shader fail(sm<5)]
@@ -197,12 +197,12 @@ void main()
 uniform 0 uint  0xffffffff
 uniform 1 float 0x80000000
 todo(glsl | msl) dispatch 1 1 1
-probe uav 1 (0) rui (0xffffffff)
-probe uav 1 (1) rui (1)
-probe uav 1 (2) rui (0x7fffffff)
+probe uav 1 (0) u32(0xffffffff)
+probe uav 1 (1) u32(1)
+probe uav 1 (2) u32(0x7fffffff)
 probe uav 2 (0) i32(1)
 probe uav 2 (1) i32(-1)
-probe uav 2 (2) rui (0x7fffffff)
+probe uav 2 (2) u32(0x7fffffff)
 
 [uav 1]
 format r32-uint
@@ -247,14 +247,14 @@ void main()
 uniform 0 uint  0xffffffff
 uniform 1 float -1
 todo(glsl | msl) dispatch 1 1 1
-if(sm<6)  probe uav 1 (0) rui (0xffffffff)
-if(sm>=6) probe uav 1 (0) rui (0xfffffffd)
-probe uav 1 (1) rui (0)
-probe uav 1 (2) rui (0)
-probe uav 1 (3) rui (0xffffffff)
-probe uav 1 (4) rui (0xffffffff)
+if(sm<6)  probe uav 1 (0) u32(0xffffffff)
+if(sm>=6) probe uav 1 (0) u32(0xfffffffd)
+probe uav 1 (1) u32(0)
+probe uav 1 (2) u32(0)
+probe uav 1 (3) u32(0xffffffff)
+probe uav 1 (4) u32(0xffffffff)
 if(sm<6)  probe uav 2 (0) i32(-1)
-if(sm>=6) probe uav 2 (0) rui (0xfffffffd)
+if(sm>=6) probe uav 2 (0) u32(0xfffffffd)
 probe uav 2 (1) i32(0)
 probe uav 2 (2) i32(0)
 probe uav 2 (3) i32(-1)
diff --git a/tests/hlsl/uav-counter.shader_test b/tests/hlsl/uav-counter.shader_test
index a32417852..a2b208eb4 100644
--- a/tests/hlsl/uav-counter.shader_test
+++ b/tests/hlsl/uav-counter.shader_test
@@ -16,7 +16,7 @@ void main()
 
 [test]
 todo(sm<6) dispatch 3 1 1
-probe uav 1 (0) rui (12)
+probe uav 1 (0) u32(12)
 
 [uav 1]
 size (counter_buffer, 1)
diff --git a/tests/hlsl/uav-rwbuffer.shader_test b/tests/hlsl/uav-rwbuffer.shader_test
index 577c6026d..627287444 100644
--- a/tests/hlsl/uav-rwbuffer.shader_test
+++ b/tests/hlsl/uav-rwbuffer.shader_test
@@ -280,7 +280,7 @@ void main()
 % NVIDIA zero-extend, while AMD sign-extends; therefore we test neither.
 uniform 0 uint4 0x7ff4000b 0xe7ff3 0 0
 dispatch 1 1 1
-probe uav 1 (0) rgbaui(0xb, 0x7ff4, 0x7ff3, 0xe)
+probe uav 1 (0) u32(0xb, 0x7ff4, 0x7ff3, 0xe)
 
 [uav 1]
 format r32g32b32a32-sint
@@ -335,4 +335,4 @@ uint4 main() : sv_target
 
 [test]
 draw quad
-probe (0, 0) rgbaui(0, 1, 10, 100)
+probe (0, 0) u32(0, 1, 10, 100)
diff --git a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test
index 2e2714ea2..d3ed1950f 100644
--- a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test
+++ b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test
@@ -35,7 +35,7 @@ float4 main() : sv_target
 
 [test]
 todo(glsl | msl) draw quad
-probe uav 1 (0) rgbaui(10, 11, 12, 13)
+probe uav 1 (0) u32(10, 11, 12, 13)
 
 [pixel shader]
 RWByteAddressBuffer u : register(u1);
@@ -49,7 +49,7 @@ float4 main() : sv_target
 
 [test]
 todo(glsl | msl) draw quad
-probe uav 1 (0) rgbaui(20, 21, 22, 23)
+probe uav 1 (0) u32(20, 21, 22, 23)
 
 [pixel shader]
 RWByteAddressBuffer u : register(u1);
@@ -63,7 +63,7 @@ float4 main() : sv_target
 
 [test]
 todo(glsl | msl) draw quad
-probe uav 1 (0) rgbaui(20, 21, 22, 23)
+probe uav 1 (0) u32(20, 21, 22, 23)
 
 [require]
 shader model >= 5.0
@@ -124,6 +124,6 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 1 (0) rui(0xfff4000b)
-probe uav 1 (1) rui(0xfff2000d)
-probe uav 1 (2) rui(0x4b404ab0)
+probe uav 1 (0) u32(0xfff4000b)
+probe uav 1 (1) u32(0xfff2000d)
+probe uav 1 (2) u32(0x4b404ab0)
diff --git a/tests/hlsl/uav-rwstructuredbuffer.shader_test b/tests/hlsl/uav-rwstructuredbuffer.shader_test
index 76d097eee..26fbbb6ac 100644
--- a/tests/hlsl/uav-rwstructuredbuffer.shader_test
+++ b/tests/hlsl/uav-rwstructuredbuffer.shader_test
@@ -210,9 +210,9 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 2 (0) rui(0xfff44990)
-probe uav 2 (1) rui(0x4a20000d)
-probe uav 2 (2) rui(0xfff2000d)
+probe uav 2 (0) u32(0xfff44990)
+probe uav 2 (1) u32(0x4a20000d)
+probe uav 2 (2) u32(0xfff2000d)
 
 [uav 2]
 stride 12
@@ -241,12 +241,12 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 2 (0) rui(0x4a204990)
-probe uav 2 (1) rui(0x000dfff4)
-probe uav 2 (2) rui(0xfff1000e)
-probe uav 2 (3) rui(0x4b404ab0)
-probe uav 2 (4) rui(0x0011fff0)
-probe uav 2 (5) rui(0xffeb0012)
+probe uav 2 (0) u32(0x4a204990)
+probe uav 2 (1) u32(0x000dfff4)
+probe uav 2 (2) u32(0xfff1000e)
+probe uav 2 (3) u32(0x4b404ab0)
+probe uav 2 (4) u32(0x0011fff0)
+probe uav 2 (5) u32(0xffeb0012)
 
 [uav 2]
 stride 12
@@ -276,12 +276,12 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 2 (0) rui(0xfff44990)
-probe uav 2 (1) rui(13)
-probe uav 2 (2) rui(0x20001)
-probe uav 2 (3) rui(0x000d4a20)
-probe uav 2 (4) rui(0xfffffff2)
-probe uav 2 (5) rui(0x40003)
+probe uav 2 (0) u32(0xfff44990)
+probe uav 2 (1) u32(13)
+probe uav 2 (2) u32(0x20001)
+probe uav 2 (3) u32(0x000d4a20)
+probe uav 2 (4) u32(0xfffffff2)
+probe uav 2 (5) u32(0x40003)
 
 [uav 2]
 stride 16
@@ -310,14 +310,14 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 2 (0) rui(0x4990)
-probe uav 2 (1) rui(3)
-probe uav 2 (2) rui(0xdfff4)
-probe uav 2 (3) rui(0x20001)
-probe uav 2 (4) rui(0x4a20)
-probe uav 2 (5) rui(5)
-probe uav 2 (6) rui(0xfff2000d)
-probe uav 2 (7) rui(0x40003)
+probe uav 2 (0) u32(0x4990)
+probe uav 2 (1) u32(3)
+probe uav 2 (2) u32(0xdfff4)
+probe uav 2 (3) u32(0x20001)
+probe uav 2 (4) u32(0x4a20)
+probe uav 2 (5) u32(5)
+probe uav 2 (6) u32(0xfff2000d)
+probe uav 2 (7) u32(0x40003)
 
 [require]
 shader model >= 6.2
@@ -351,13 +351,13 @@ void main()
 
 [test]
 dispatch 1 1 1
-probe uav 2 (0) rui(0x4990)
-probe uav 2 (1) rui(0)
+probe uav 2 (0) u32(0x4990)
+probe uav 2 (1) u32(0)
 probe uav 2 (1) f64(5.25)
-probe uav 2 (4) rui(13)
-probe uav 2 (5) rui(0)
-probe uav 2 (6) rui(0x4a20)
-probe uav 2 (7) rui(0)
+probe uav 2 (4) u32(13)
+probe uav 2 (5) u32(0)
+probe uav 2 (6) u32(0x4a20)
+probe uav 2 (7) u32(0)
 probe uav 2 (4) f64(-4.25)
-probe uav 2 (10) rui(15)
-probe uav 2 (11) rui(0)
+probe uav 2 (10) u32(15)
+probe uav 2 (11) u32(0)
diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test
index b273c5608..51951bd22 100644
--- a/tests/hlsl/wave-ops-float.shader_test
+++ b/tests/hlsl/wave-ops-float.shader_test
@@ -39,10 +39,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rgbaui (1, 0, 0, 1)
-probe uav 1 (1) rgbaui (1, 0, 0, 1)
-probe uav 1 (2) rgbaui (1, 0, 0, 1)
-probe uav 1 (3) rgbaui (1, 0, 0, 1)
+probe uav 1 (0) u32(1, 0, 0, 1)
+probe uav 1 (1) u32(1, 0, 0, 1)
+probe uav 1 (2) u32(1, 0, 0, 1)
+probe uav 1 (3) u32(1, 0, 0, 1)
 
 
 [compute shader]
@@ -61,14 +61,14 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rgbaui (1, 1, 0, 0)
-probe uav 1 (1) rgbaui (1, 1, 0, 0)
-probe uav 1 (2) rgbaui (1, 1, 0, 0)
-probe uav 1 (3) rgbaui (1, 1, 0, 0)
-probe uav 1 (4) rgbaui (0, 1, 0, 0)
-probe uav 1 (5) rgbaui (0, 1, 0, 0)
-probe uav 1 (6) rgbaui (0, 1, 0, 0)
-probe uav 1 (7) rgbaui (0, 1, 0, 0)
+probe uav 1 (0) u32(1, 1, 0, 0)
+probe uav 1 (1) u32(1, 1, 0, 0)
+probe uav 1 (2) u32(1, 1, 0, 0)
+probe uav 1 (3) u32(1, 1, 0, 0)
+probe uav 1 (4) u32(0, 1, 0, 0)
+probe uav 1 (5) u32(0, 1, 0, 0)
+probe uav 1 (6) u32(0, 1, 0, 0)
+probe uav 1 (7) u32(0, 1, 0, 0)
 
 
 [compute shader]
@@ -84,7 +84,7 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rgbaui (0xb, 0, 0, 0)
+probe uav 1 (0) u32(0xb, 0, 0, 0)
 
 
 [uav 1]
@@ -506,10 +506,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rgbaui(1, 0, 0, 0)
-probe uav 1 (1) rgbaui(1, 0, 0, 0)
-probe uav 1 (2) rgbaui(1, 0, 0, 0)
-probe uav 1 (3) rgbaui(1, 0, 0, 0)
+probe uav 1 (0) u32(1, 0, 0, 0)
+probe uav 1 (1) u32(1, 0, 0, 0)
+probe uav 1 (2) u32(1, 0, 0, 0)
+probe uav 1 (3) u32(1, 0, 0, 0)
 
 
 [compute shader]
diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test
index 86c4e951a..102fb004b 100644
--- a/tests/hlsl/wave-ops-uint.shader_test
+++ b/tests/hlsl/wave-ops-uint.shader_test
@@ -26,10 +26,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (1)
-probe uav 1 (1) rui (0)
-probe uav 1 (2) rui (0)
-probe uav 1 (3) rui (0)
+probe uav 1 (0) u32(1)
+probe uav 1 (1) u32(0)
+probe uav 1 (2) u32(0)
+probe uav 1 (3) u32(0)
 
 
 [compute shader]
@@ -48,10 +48,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (0)
-probe uav 1 (1) rui (1)
-probe uav 1 (2) rui (0)
-probe uav 1 (3) rui (0)
+probe uav 1 (0) u32(0)
+probe uav 1 (1) u32(1)
+probe uav 1 (2) u32(0)
+probe uav 1 (3) u32(0)
 
 
 [compute shader]
@@ -65,10 +65,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (0)
-probe uav 1 (1) rui (1)
-probe uav 1 (2) rui (2)
-probe uav 1 (3) rui (3)
+probe uav 1 (0) u32(0)
+probe uav 1 (1) u32(1)
+probe uav 1 (2) u32(2)
+probe uav 1 (3) u32(3)
 
 
 [compute shader]
@@ -84,10 +84,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (1)
-probe uav 1 (1) rui (1)
-probe uav 1 (2) rui (1)
-probe uav 1 (3) rui (1)
+probe uav 1 (0) u32(1)
+probe uav 1 (1) u32(1)
+probe uav 1 (2) u32(1)
+probe uav 1 (3) u32(1)
 
 
 [compute shader]
@@ -103,10 +103,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (8)
-probe uav 1 (1) rui (8)
-probe uav 1 (2) rui (8)
-probe uav 1 (3) rui (8)
+probe uav 1 (0) u32(8)
+probe uav 1 (1) u32(8)
+probe uav 1 (2) u32(8)
+probe uav 1 (3) u32(8)
 
 
 [compute shader]
@@ -122,10 +122,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (5)
-probe uav 1 (1) rui (5)
-probe uav 1 (2) rui (5)
-probe uav 1 (3) rui (5)
+probe uav 1 (0) u32(5)
+probe uav 1 (1) u32(5)
+probe uav 1 (2) u32(5)
+probe uav 1 (3) u32(5)
 
 
 [compute shader]
@@ -141,10 +141,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (23)
-probe uav 1 (1) rui (23)
-probe uav 1 (2) rui (23)
-probe uav 1 (3) rui (23)
+probe uav 1 (0) u32(23)
+probe uav 1 (1) u32(23)
+probe uav 1 (2) u32(23)
+probe uav 1 (3) u32(23)
 
 
 [compute shader]
@@ -160,10 +160,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (18)
-probe uav 1 (1) rui (18)
-probe uav 1 (2) rui (18)
-probe uav 1 (3) rui (18)
+probe uav 1 (0) u32(18)
+probe uav 1 (1) u32(18)
+probe uav 1 (2) u32(18)
+probe uav 1 (3) u32(18)
 
 
 [compute shader]
@@ -180,10 +180,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (18)
-probe uav 1 (1) rui (18)
-probe uav 1 (2) rui (23)
-probe uav 1 (3) rui (23)
+probe uav 1 (0) u32(18)
+probe uav 1 (1) u32(18)
+probe uav 1 (2) u32(23)
+probe uav 1 (3) u32(23)
 
 
 [compute shader]
@@ -199,10 +199,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (2)
-probe uav 1 (1) rui (2)
-probe uav 1 (2) rui (2)
-probe uav 1 (3) rui (2)
+probe uav 1 (0) u32(2)
+probe uav 1 (1) u32(2)
+probe uav 1 (2) u32(2)
+probe uav 1 (3) u32(2)
 
 
 [compute shader]
@@ -218,10 +218,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (0)
-probe uav 1 (1) rui (1)
-probe uav 1 (2) rui (1)
-probe uav 1 (3) rui (2)
+probe uav 1 (0) u32(0)
+probe uav 1 (1) u32(1)
+probe uav 1 (2) u32(1)
+probe uav 1 (3) u32(2)
 
 
 [compute shader]
@@ -236,10 +236,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (41)
-probe uav 1 (1) rui (41)
-probe uav 1 (2) rui (41)
-probe uav 1 (3) rui (41)
+probe uav 1 (0) u32(41)
+probe uav 1 (1) u32(41)
+probe uav 1 (2) u32(41)
+probe uav 1 (3) u32(41)
 
 
 [compute shader]
@@ -254,10 +254,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (8)
-probe uav 1 (1) rui (8)
-probe uav 1 (2) rui (8)
-probe uav 1 (3) rui (8)
+probe uav 1 (0) u32(8)
+probe uav 1 (1) u32(8)
+probe uav 1 (2) u32(8)
+probe uav 1 (3) u32(8)
 
 
 [compute shader]
@@ -272,10 +272,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (15)
-probe uav 1 (1) rui (15)
-probe uav 1 (2) rui (15)
-probe uav 1 (3) rui (15)
+probe uav 1 (0) u32(15)
+probe uav 1 (1) u32(15)
+probe uav 1 (2) u32(15)
+probe uav 1 (3) u32(15)
 
 
 [compute shader]
@@ -290,10 +290,10 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 4 1 1
-probe uav 1 (0) rui (5)
-probe uav 1 (1) rui (5)
-probe uav 1 (2) rui (5)
-probe uav 1 (3) rui (5)
+probe uav 1 (0) u32(5)
+probe uav 1 (1) u32(5)
+probe uav 1 (2) u32(5)
+probe uav 1 (3) u32(5)
 
 
 [compute shader]
@@ -320,10 +320,10 @@ void main(uint id : SV_GroupIndex)
 [test]
 uniform 0 uint4 1 5 0 0
 dispatch 4 1 1
-probe uav 1 (0) rui (29)
-probe uav 1 (1) rui (29)
-probe uav 1 (2) rui (29)
-probe uav 1 (3) rui (29)
+probe uav 1 (0) u32(29)
+probe uav 1 (1) u32(29)
+probe uav 1 (2) u32(29)
+probe uav 1 (3) u32(29)
 
 
 [require]
diff --git a/tests/hlsl/wave-reconvergence.shader_test b/tests/hlsl/wave-reconvergence.shader_test
index a91e42703..35685897e 100644
--- a/tests/hlsl/wave-reconvergence.shader_test
+++ b/tests/hlsl/wave-reconvergence.shader_test
@@ -63,29 +63,29 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 1 1 1
-probe uav 2 (0) rui (0xf01)
-bug(mvk) probe uav 2 (1) rui (0x503)
-probe uav 2 (2) rui (0x511)
-bug(mvk) probe uav 2 (3) rui (0x113)
-probe uav 2 (4) rui (0xf24)
+probe uav 2 (0) u32(0xf01)
+bug(mvk) probe uav 2 (1) u32(0x503)
+probe uav 2 (2) u32(0x511)
+bug(mvk) probe uav 2 (3) u32(0x113)
+probe uav 2 (4) u32(0xf24)
 
-probe uav 2 (5) rui (0xf01)
-bug(mvk) probe uav 2 (6) rui (0xa02)
-probe uav 2 (7) rui (0xf04)
-probe uav 2 (8) rui (0)
-probe uav 2 (9) rui (0)
+probe uav 2 (5) u32(0xf01)
+bug(mvk) probe uav 2 (6) u32(0xa02)
+probe uav 2 (7) u32(0xf04)
+probe uav 2 (8) u32(0)
+probe uav 2 (9) u32(0)
 
-probe uav 2 (10) rui (0xf01)
-bug(mvk) probe uav 2 (11) rui (0x503)
-probe uav 2 (12) rui (0x511)
-bug(mvk) probe uav 2 (13) rui (0x412)
-probe uav 2 (14) rui (0xf14)
+probe uav 2 (10) u32(0xf01)
+bug(mvk) probe uav 2 (11) u32(0x503)
+probe uav 2 (12) u32(0x511)
+bug(mvk) probe uav 2 (13) u32(0x412)
+probe uav 2 (14) u32(0xf14)
 
-probe uav 2 (15) rui (0xf01)
-bug(mvk) probe uav 2 (16) rui (0xa02)
-probe uav 2 (17) rui (0xf04)
-probe uav 2 (18) rui (0)
-probe uav 2 (19) rui (0)
+probe uav 2 (15) u32(0xf01)
+bug(mvk) probe uav 2 (16) u32(0xa02)
+probe uav 2 (17) u32(0xf04)
+probe uav 2 (18) u32(0)
+probe uav 2 (19) u32(0)
 
 [uav 2]
 format r32-uint
@@ -131,26 +131,26 @@ void main(uint id : SV_GroupIndex)
 
 [test]
 dispatch 1 1 1
-probe uav 2 (0) rui (0x701)
-bug(mvk) probe uav 2 (1) rui (0x503)
-probe uav 2 (2) rui (0x511)
-bug(mvk) probe uav 2 (3) rui (0x113)
-probe uav 2 (4) rui (0x724)
+probe uav 2 (0) u32(0x701)
+bug(mvk) probe uav 2 (1) u32(0x503)
+probe uav 2 (2) u32(0x511)
+bug(mvk) probe uav 2 (3) u32(0x113)
+probe uav 2 (4) u32(0x724)
 
-probe uav 2 (5) rui (0x701)
-bug(mvk) probe uav 2 (6) rui (0x202)
-probe uav 2 (7) rui (0x704)
-probe uav 2 (8) rui (0)
-probe uav 2 (9) rui (0)
+probe uav 2 (5) u32(0x701)
+bug(mvk) probe uav 2 (6) u32(0x202)
+probe uav 2 (7) u32(0x704)
+probe uav 2 (8) u32(0)
+probe uav 2 (9) u32(0)
 
-probe uav 2 (10) rui (0x701)
-bug(mvk) probe uav 2 (11) rui (0x503)
-probe uav 2 (12) rui (0x511)
-bug(mvk) probe uav 2 (13) rui (0x412)
-probe uav 2 (14) rui (0x714)
+probe uav 2 (10) u32(0x701)
+bug(mvk) probe uav 2 (11) u32(0x503)
+probe uav 2 (12) u32(0x511)
+bug(mvk) probe uav 2 (13) u32(0x412)
+probe uav 2 (14) u32(0x714)
 
-probe uav 2 (15) rui (0)
-probe uav 2 (16) rui (0)
-probe uav 2 (17) rui (0)
-probe uav 2 (18) rui (0)
-probe uav 2 (19) rui (0)
+probe uav 2 (15) u32(0)
+probe uav 2 (16) u32(0)
+probe uav 2 (17) u32(0)
+probe uav 2 (18) u32(0)
+probe uav 2 (19) u32(0)
diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index a215a3ff0..2a01ed0ab 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -818,7 +818,7 @@ static void read_uint(const char **line, unsigned int *u, bool is_uniform)
     if (*u != val)
         fatal_error("Out of range uint constant '%.*s'.\n", (int)(rest - *line), *line);
 
-    *line = rest + (!is_uniform && *rest == ',');
+    *line = rest;
 }
 
 static void read_int4(const char **line, struct ivec4 *v)
@@ -829,12 +829,12 @@ static void read_int4(const char **line, struct ivec4 *v)
     read_int(line, &v->w, true);
 }
 
-static void read_uint4(const char **line, struct uvec4 *v, bool is_uniform)
+static void read_uint4(const char **line, struct uvec4 *v)
 {
-    read_uint(line, &v->x, is_uniform);
-    read_uint(line, &v->y, is_uniform);
-    read_uint(line, &v->z, is_uniform);
-    read_uint(line, &v->w, is_uniform);
+    read_uint(line, &v->x, true);
+    read_uint(line, &v->y, true);
+    read_uint(line, &v->z, true);
+    read_uint(line, &v->w, true);
 }
 
 static void read_int64(const char **line, int64_t *i, bool is_uniform)
@@ -1288,40 +1288,52 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
                 check_readback_data_double(rb, &rect, v.x, ulps);
             }
         }
-        else if (match_string(line, "i32", &line))
+        else if (match_string(line, "u32", &line) || (is_signed = match_string(line, "i32", &line)))
         {
-            struct ivec4 v;
+            struct uvec4 v;
 
             if (*line != '(')
                 fatal_error("Malformed probe arguments '%s'.\n", line);
             ++line;
 
-            read_int(&line, &v.x, false);
+            if (is_signed)
+                read_int(&line, (int32_t *)&v.x, false);
+            else
+                read_uint(&line, &v.x, false);
 
             while (isspace(*line))
                 ++line;
             if (*line == ',')
             {
                 ++line;
-                read_int(&line, &v.y, false);
+                if (is_signed)
+                    read_int(&line, (int32_t *)&v.y, false);
+                else
+                    read_uint(&line, &v.y, false);
 
                 while (isspace(*line))
                     ++line;
                 if (*line != ',')
                     fatal_error("Malformed probe arguments '%s'.\n", line);
                 ++line;
-                read_int(&line, &v.z, false);
+                if (is_signed)
+                    read_int(&line, (int32_t *)&v.z, false);
+                else
+                    read_uint(&line, &v.z, false);
 
                 while (isspace(*line))
                     ++line;
                 if (*line != ',')
                     fatal_error("Malformed probe arguments '%s'.\n", line);
                 ++line;
-                read_int(&line, &v.w, false);
+                if (is_signed)
+                    read_int(&line, (int32_t *)&v.w, false);
+                else
+                    read_uint(&line, &v.w, false);
 
                 line = close_parentheses(line);
                 todo_if(runner->is_todo) bug_if(runner->is_bug)
-                check_readback_data_ivec4(rb, &rect, &v);
+                check_readback_data_uvec4(rb, &rect, &v);
             }
             else
             {
@@ -1330,18 +1342,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
                 check_readback_data_uint(rb, &box, v.x, 0);
             }
         }
-        else if (match_string(line, "rgbaui", &line))
-        {
-            struct uvec4 v;
-
-            if (*line != '(')
-                fatal_error("Malformed probe arguments '%s'.\n", line);
-            ++line;
-            read_uint4(&line, &v, false);
-            line = close_parentheses(line);
-            todo_if(runner->is_todo) bug_if(runner->is_bug)
-            check_readback_data_uvec4(rb, &rect, &v);
-        }
         else if (match_string(line, "rgba", &line))
         {
             struct vec4 v;
@@ -1366,18 +1366,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
             todo_if(runner->is_todo) bug_if(runner->is_bug)
             check_readback_data_vec2(rb, &rect, &v, ulps);
         }
-        else if (match_string(line, "rui", &line))
-        {
-            unsigned int expect;
-
-            if (*line != '(')
-                fatal_error("Malformed probe arguments '%s'.\n", line);
-            ++line;
-            read_uint(&line, &expect, false);
-            line = close_parentheses(line);
-            todo_if(runner->is_todo) bug_if(runner->is_bug)
-            check_readback_data_uint(rb, &box, expect, 0);
-        }
         else if (match_string(line, "r", &line))
         {
             float expect;
@@ -1440,7 +1428,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
         {
             struct uvec4 v;
 
-            read_uint4(&line, &v, true);
+            read_uint4(&line, &v);
             set_uniforms(runner, offset, 4, &v);
         }
         else if (match_string(line, "int", &line))