Re: [Piglit] [PATCH] shader_runner: don't abort on atomic counter subtest failure

[Dave Airlie]

Reviewed-by: Dave Airlie 

On Fri, 24 May 2019 at 11:38, Marek Olšák  wrote:
>
> From: Marek Olšák 
>
> ---
>  tests/shaders/shader_runner.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
> index 8404d548f..6729d82b7 100644
> --- a/tests/shaders/shader_runner.c
> +++ b/tests/shaders/shader_runner.c
> @@ -3958,27 +3958,27 @@ piglit_display(void)
> } else if (parse_str(line, "probe depth ", )) {
> parse_floats(rest, c, 3, NULL);
> if (!piglit_probe_pixel_depth((int) c[0], (int) c[1],
>   c[2])) {
> result = PIGLIT_FAIL;
> }
> } else if (sscanf(line,
>   "probe atomic counter buffer %u %u %s %u",
>   , , s, ) == 4) {
> if (!probe_atomic_counter(ux, uy, s, uz, true)) {
> -   piglit_report_result(PIGLIT_FAIL);
> +   result = PIGLIT_FAIL;
> }
> } else if (sscanf(line,
>   "probe atomic counter %u %s %u",
>   , s, ) == 3) {
> if (!probe_atomic_counter(0, ux, s, uy, false)) {
> -   piglit_report_result(PIGLIT_FAIL);
> +   result = PIGLIT_FAIL;
> }
> } else if (sscanf(line, "probe ssbo uint %d %d %s 0x%x",
>   , , s, ) == 4) {
> if (!probe_ssbo_uint(x, y, s, z))
> result = PIGLIT_FAIL;
> } else if (sscanf(line, "probe ssbo uint %d %d %s %d",
>   , , s, ) == 4) {
> if (!probe_ssbo_uint(x, y, s, z))
> result = PIGLIT_FAIL;
> } else if (sscanf(line,
> --
> 2.17.1
>
> ___
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] shader_runner: don't abort on atomic counter subtest failure

[Marek Olšák]

From: Marek Olšák 

---
 tests/shaders/shader_runner.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 8404d548f..6729d82b7 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -3958,27 +3958,27 @@ piglit_display(void)
} else if (parse_str(line, "probe depth ", )) {
parse_floats(rest, c, 3, NULL);
if (!piglit_probe_pixel_depth((int) c[0], (int) c[1],
  c[2])) {
result = PIGLIT_FAIL;
}
} else if (sscanf(line,
  "probe atomic counter buffer %u %u %s %u",
  , , s, ) == 4) {
if (!probe_atomic_counter(ux, uy, s, uz, true)) {
-   piglit_report_result(PIGLIT_FAIL);
+   result = PIGLIT_FAIL;
}
} else if (sscanf(line,
  "probe atomic counter %u %s %u",
  , s, ) == 3) {
if (!probe_atomic_counter(0, ux, s, uy, false)) {
-   piglit_report_result(PIGLIT_FAIL);
+   result = PIGLIT_FAIL;
}
} else if (sscanf(line, "probe ssbo uint %d %d %s 0x%x",
  , , s, ) == 4) {
if (!probe_ssbo_uint(x, y, s, z))
result = PIGLIT_FAIL;
} else if (sscanf(line, "probe ssbo uint %d %d %s %d",
  , , s, ) == 4) {
if (!probe_ssbo_uint(x, y, s, z))
result = PIGLIT_FAIL;
} else if (sscanf(line,
-- 
2.17.1

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] cl: Add tests for some cases that were broken with function calls

[arsenm2]

From: Matt Arsenault 

---
 .../program/execute/call-clobbers-amdgcn.cl   | 102 ++
 1 file changed, 102 insertions(+)

diff --git a/tests/cl/program/execute/call-clobbers-amdgcn.cl 
b/tests/cl/program/execute/call-clobbers-amdgcn.cl
index 18e657ce3..b0a1f8c70 100644
--- a/tests/cl/program/execute/call-clobbers-amdgcn.cl
+++ b/tests/cl/program/execute/call-clobbers-amdgcn.cl
@@ -19,6 +19,49 @@ dimensions: 1
 global_size: 1 0 0
 arg_out: 0 buffer int[1] 0xabcd1234
 
+[test]
+name: Conditional call
+kernel_name: conditional_call
+dimensions: 1
+local_size: 64 0 0
+global_size: 64 0 0
+arg_out: 0 buffer int[64] \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234
+
+[test]
+name: Conditional call partial dispatch
+kernel_name: conditional_call
+dimensions: 1
+local_size: 16 0 0
+global_size: 16 0 0
+arg_out: 0 buffer int[16] \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234 \
+  0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 0xabcd1234 
0xabcd1234
+
+
+[test]
+name: Skip call no lanes
+kernel_name: skip_call_no_lanes
+dimensions: 1
+local_size: 64 0 0
+global_size: 64 0 0
+arg_out: 0 buffer int[64] \
+  123 123 123 123 123 123 123 123 \
+  123 123 123 123 123 123 123 123 \
+  123 123 123 123 123 123 123 123 \
+  123 123 123 123 123 123 123 123 \
+  123 123 123 123 123 123 123 123 \
+  123 123 123 123 123 123 123 123 \
+  123 123 123 123 123 123 123 123 \
+  123 123 123 123 123 123 123 123
+
 !*/
 
 #ifndef __AMDGCN__
@@ -65,3 +108,62 @@ kernel void call_clobber_v40(__global int* ret)
   : "v40");
 *ret = tmp;
 }
+
+__attribute__((noinline))
+void spill_sgpr_to_csr_vgpr()
+{
+__asm volatile(
+"s_nop 1" :::
+"v0","v1","v2","v3","v4","v5","v6","v7",
+"v8","v9","v10","v11","v12","v13","v14","v15",
+"v16","v17","v18","v19","v20","v21","v22","v23",
+"v24","v25","v26","v27","v28","v29","v30","v31",
+
+"s0","s1","s2","s3","s4","s5","s6","s7",
+"s8","s9","s10","s11","s12","s13","s14","s15",
+"s16","s17","s18","s19","s20","s21","s22","s23",
+"s24","s25","s26","s27","s28","s29","s30","s31",
+"s32", "s33", "s34", "s35", "s36", "s37", "s38");
+}
+
+// A CSR VGPR needs to be spilled/restored in the prolog/epilog, but
+// all lanes need to be made active to avoid clobbering lanes that did
+// not enter the call.
+kernel void conditional_call(global int* ret)
+{
+__asm volatile("v_mov_b32 v32, 0xabcd1234" : : : "v32");
+
+int id = get_local_id(0);
+if (id == 0)
+{
+spill_sgpr_to_csr_vgpr();
+}
+
+int tmp;
+__asm volatile("v_mov_b32 %0, v32"
+   : "=v"(tmp)
+   :
+   : "v32");
+ret[id] = tmp;
+}
+
+__attribute__((noinline))
+void hang_if_all_inactive()
+{
+__builtin_amdgcn_s_sendmsghalt(0, 0);
+}
+
+// If all lanes could be dynamically false, the call must not be taken
+// in case a side effecting scalar op is called inside.
+kernel void skip_call_no_lanes(global int* ret)
+{
+int divergent_false;
+__asm volatile("v_mov_b32 %0, 0" : "=v"(divergent_false));
+
+if (divergent_false)
+{
+hang_if_all_inactive();
+}
+
+ret[get_global_id(0)] = 123;
+}
-- 
2.17.1

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit