From 8eb2743b1fb24fa944a70ceea2b188877368aba6 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Mon, 15 Apr 2024 16:30:56 +0100 Subject: [PATCH] aco/tests: remove LLVM 11 code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RADV requires LLVM 15+. Signed-off-by: Rhys Perry Reviewed-by: Timur Kristóf Part-of: --- src/amd/compiler/tests/test_isel.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/amd/compiler/tests/test_isel.cpp b/src/amd/compiler/tests/test_isel.cpp index 96c7d8040fa23..fe23c7b3f5110 100644 --- a/src/amd/compiler/tests/test_isel.cpp +++ b/src/amd/compiler/tests/test_isel.cpp @@ -131,13 +131,6 @@ BEGIN_TEST(isel.sparse.clause) uint code[4]; }; void main() { - //! llvm_version: #llvm_ver - //; if llvm_ver >= 12: - //; funcs['sample_res'] = lambda _: 'v[#_:#_]' - //; funcs['sample_coords'] = lambda _: '[v#_, v#_, v#_]' - //; else: - //; funcs['sample_res'] = lambda _: 'v#_' - //; funcs['sample_coords'] = lambda _: '[v#_, v#_, v#_, v#_]' //>> v5: (noCSE)%zero0 = p_create_vector 0, 0, 0, 0, 0 //>> v5: %_ = image_sample_lz_o %_, %_, (kill)%zero0, (kill)%_, %_, %_ dmask:xyzw 2d tfe //>> v5: (noCSE)%zero1 = p_create_vector 0, 0, 0, 0, 0 @@ -147,10 +140,10 @@ BEGIN_TEST(isel.sparse.clause) //>> v5: (noCSE)%zero3 = p_create_vector 0, 0, 0, 0, 0 //>> v5: %_ = image_sample_lz_o (kill)%_, (kill)%_, (kill)%zero3, (kill)%_, (kill)%_, (kill)%_ dmask:xyzw 2d tfe //>> s_clause 0x3 - //! image_sample_lz_o @sample_res, @sample_coords, @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe - //! image_sample_lz_o @sample_res, @sample_coords, @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe - //! image_sample_lz_o @sample_res, @sample_coords, @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe - //! image_sample_lz_o @sample_res, @sample_coords, @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe + //! image_sample_lz_o v[#_:#_], [v#_, v#_, v#_], @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe + //! image_sample_lz_o v[#_:#_], [v#_, v#_, v#_], @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe + //! image_sample_lz_o v[#_:#_], [v#_, v#_, v#_], @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe + //! image_sample_lz_o v[#_:#_], [v#_, v#_, v#_], @s256(img), @s128(samp) dmask:0xf dim:SQ_RSRC_IMG_2D tfe code[0] = sparseTextureOffsetARB(tex, vec2(0.5), ivec2(1, 0), res[0]); code[1] = sparseTextureOffsetARB(tex, vec2(0.5), ivec2(2, 0), res[1]); code[2] = sparseTextureOffsetARB(tex, vec2(0.5), ivec2(3, 0), res[2]); @@ -158,8 +151,6 @@ BEGIN_TEST(isel.sparse.clause) } ); - fprintf(output, "llvm_version: %u\n", LLVM_VERSION_MAJOR); - PipelineBuilder pbld(get_vk_device((amd_gfx_level)i)); pbld.add_cs(cs); pbld.print_ir(VK_SHADER_STAGE_COMPUTE_BIT, "ACO IR", true);