From c7232be53731680ced0a5d7c151127261826f64c Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 6 Jun 2023 16:48:09 -0400 Subject: [PATCH] nir/tests: Use scoped barriers internally Test what drivers actually use. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Caio Oliveira Reviewed-by: Jesse Natalie Part-of: --- src/compiler/nir/tests/load_store_vectorizer_tests.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/compiler/nir/tests/load_store_vectorizer_tests.cpp b/src/compiler/nir/tests/load_store_vectorizer_tests.cpp index 260d76aed91..2f1770c4b95 100644 --- a/src/compiler/nir/tests/load_store_vectorizer_tests.cpp +++ b/src/compiler/nir/tests/load_store_vectorizer_tests.cpp @@ -836,13 +836,14 @@ TEST_F(nir_load_store_vectorize_test, ssbo_load_adjacent_memory_barrier) ASSERT_EQ(count_intrinsics(nir_intrinsic_load_ssbo), 2); } -/* nir_intrinsic_control_barrier only syncs invocations in a workgroup, it - * doesn't require that loads/stores complete. +/* A control barrier may only sync invocations in a workgroup, it doesn't + * require that loads/stores complete. */ TEST_F(nir_load_store_vectorize_test, ssbo_load_adjacent_barrier) { create_load(nir_var_mem_ssbo, 0, 0, 0x1); - nir_control_barrier(b); + nir_scoped_barrier(b, NIR_SCOPE_WORKGROUP, NIR_SCOPE_NONE, + (nir_memory_semantics)0, (nir_variable_mode)0); create_load(nir_var_mem_ssbo, 0, 4, 0x2); nir_validate_shader(b->shader, NULL);