From 1725d9aa672ee13a5cc202b975e5c6bef601db95 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 26 May 2023 19:14:31 +0100 Subject: [PATCH] radv,aco: tweaks to get clang-format to print nicer code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/.clang-format | 2 ++ src/amd/compiler/tests/test_d3d11_derivs.cpp | 32 +++++++++++++++++++++++++-- src/amd/compiler/tests/test_regalloc.cpp | 2 +- src/amd/compiler/tests/test_tests.cpp | 6 ++--- src/amd/vulkan/.clang-format | 3 +++ src/amd/vulkan/meta/radv_meta_resolve.c | 2 +- src/amd/vulkan/winsys/null/radv_null_winsys.c | 2 ++ 7 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 src/amd/vulkan/.clang-format diff --git a/src/amd/compiler/.clang-format b/src/amd/compiler/.clang-format index 2533961..a9485e6 100644 --- a/src/amd/compiler/.clang-format +++ b/src/amd/compiler/.clang-format @@ -47,3 +47,5 @@ IncludeCategories: MacroBlockBegin: 'BEGIN_TEST' MacroBlockEnd: 'END_TEST' CommentPragmas: '^(!|;|>>|~)' + +WhitespaceSensitiveMacros: ['qoShaderModuleCreateInfoGLSL'] diff --git a/src/amd/compiler/tests/test_d3d11_derivs.cpp b/src/amd/compiler/tests/test_d3d11_derivs.cpp index efb6493..b0cd1dd 100644 --- a/src/amd/compiler/tests/test_d3d11_derivs.cpp +++ b/src/amd/compiler/tests/test_d3d11_derivs.cpp @@ -27,6 +27,7 @@ using namespace aco; BEGIN_TEST(d3d11_derivs.simple) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -44,6 +45,7 @@ BEGIN_TEST(d3d11_derivs.simple) out_color = texture(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -67,6 +69,7 @@ BEGIN_TEST(d3d11_derivs.simple) END_TEST BEGIN_TEST(d3d11_derivs.constant) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in float in_coord; layout(location = 0) out float out_coord; @@ -84,6 +87,7 @@ BEGIN_TEST(d3d11_derivs.constant) out_color = texture(tex, vec2(in_coord, -0.5)); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -105,6 +109,7 @@ BEGIN_TEST(d3d11_derivs.constant) END_TEST BEGIN_TEST(d3d11_derivs.discard) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -122,6 +127,7 @@ BEGIN_TEST(d3d11_derivs.discard) out_color = texture(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -136,6 +142,7 @@ BEGIN_TEST(d3d11_derivs.discard) END_TEST BEGIN_TEST(d3d11_derivs.bias) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -153,6 +160,7 @@ BEGIN_TEST(d3d11_derivs.bias) out_color = texture(tex, in_coord, gl_FragCoord.x); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -177,6 +185,7 @@ BEGIN_TEST(d3d11_derivs.bias) END_TEST BEGIN_TEST(d3d11_derivs.offset) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -194,6 +203,7 @@ BEGIN_TEST(d3d11_derivs.offset) out_color = textureOffset(tex, in_coord, ivec2(1, 2)); } ); + // clang-format on /* Use GFX9 because we should have at least one test which doesn't use NSA. */ PipelineBuilder pbld(get_vk_device(GFX9)); @@ -221,6 +231,7 @@ BEGIN_TEST(d3d11_derivs.offset) END_TEST BEGIN_TEST(d3d11_derivs.array) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec3 in_coord; layout(location = 0) out vec3 out_coord; @@ -238,6 +249,7 @@ BEGIN_TEST(d3d11_derivs.array) out_color = texture(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -264,6 +276,7 @@ BEGIN_TEST(d3d11_derivs.array) END_TEST BEGIN_TEST(d3d11_derivs.bias_array) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec3 in_coord; layout(location = 0) out vec3 out_coord; @@ -281,6 +294,7 @@ BEGIN_TEST(d3d11_derivs.bias_array) out_color = texture(tex, in_coord, gl_FragCoord.x); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -307,7 +321,8 @@ BEGIN_TEST(d3d11_derivs.bias_array) pbld.print_ir(VK_SHADER_STAGE_FRAGMENT_BIT, "Assembly"); END_TEST -BEGIN_TEST(d3d11_derivs.1d_gfx9) +BEGIN_TEST(d3d11_derivs._1d_gfx9) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in float in_coord; layout(location = 0) out float out_coord; @@ -325,6 +340,7 @@ BEGIN_TEST(d3d11_derivs.1d_gfx9) out_color = texture(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX9)); pbld.add_vsfs(vs, fs); @@ -346,7 +362,8 @@ BEGIN_TEST(d3d11_derivs.1d_gfx9) pbld.print_ir(VK_SHADER_STAGE_FRAGMENT_BIT, "Assembly"); END_TEST -BEGIN_TEST(d3d11_derivs.1d_array_gfx9) +BEGIN_TEST(d3d11_derivs._1d_array_gfx9) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -364,6 +381,7 @@ BEGIN_TEST(d3d11_derivs.1d_array_gfx9) out_color = texture(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX9)); pbld.add_vsfs(vs, fs); @@ -391,6 +409,7 @@ BEGIN_TEST(d3d11_derivs.1d_array_gfx9) END_TEST BEGIN_TEST(d3d11_derivs.cube) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec3 in_coord; layout(location = 0) out vec3 out_coord; @@ -408,6 +427,7 @@ BEGIN_TEST(d3d11_derivs.cube) out_color = texture(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -433,6 +453,7 @@ BEGIN_TEST(d3d11_derivs.cube) END_TEST BEGIN_TEST(d3d11_derivs.cube_array) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec4 in_coord; layout(location = 0) out vec4 out_coord; @@ -450,6 +471,7 @@ BEGIN_TEST(d3d11_derivs.cube_array) out_color = texture(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -480,6 +502,7 @@ BEGIN_TEST(d3d11_derivs.cube_array) END_TEST BEGIN_TEST(d3d11_derivs.fddxy) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -497,6 +520,7 @@ BEGIN_TEST(d3d11_derivs.fddxy) out_color = vec4(dFdxFine(in_coord.x), dFdyCoarse(in_coord.y), textureLod(tex, vec2(0.5), 0.0).xy); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -510,6 +534,7 @@ END_TEST /* Ensure the BC optimize transform is done after ac_nir_lower_tex. */ BEGIN_TEST(d3d11_derivs.bc_optimize) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -527,6 +552,7 @@ BEGIN_TEST(d3d11_derivs.bc_optimize) out_color = texture(tex, vec2(in_coord.x, interpolateAtCentroid(in_coord.y))); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); @@ -545,6 +571,7 @@ BEGIN_TEST(d3d11_derivs.bc_optimize) END_TEST BEGIN_TEST(d3d11_derivs.get_lod) + // clang-format off QoShaderModuleCreateInfo vs = qoShaderModuleCreateInfoGLSL(VERTEX, layout(location = 0) in vec2 in_coord; layout(location = 0) out vec2 out_coord; @@ -562,6 +589,7 @@ BEGIN_TEST(d3d11_derivs.get_lod) out_color = textureQueryLod(tex, in_coord); } ); + // clang-format on PipelineBuilder pbld(get_vk_device(GFX10_3)); pbld.add_vsfs(vs, fs); diff --git a/src/amd/compiler/tests/test_regalloc.cpp b/src/amd/compiler/tests/test_regalloc.cpp index 9052e80..6b2b9d3 100644 --- a/src/amd/compiler/tests/test_regalloc.cpp +++ b/src/amd/compiler/tests/test_regalloc.cpp @@ -60,7 +60,7 @@ BEGIN_TEST(regalloc.subdword_alloc.reuse_16bit_operands) } END_TEST -BEGIN_TEST(regalloc.32bit_partial_write) +BEGIN_TEST(regalloc._32bit_partial_write) //>> v1: %_:v[0] = p_startpgm if (!setup_cs("v1", GFX10)) return; diff --git a/src/amd/compiler/tests/test_tests.cpp b/src/amd/compiler/tests/test_tests.cpp index cb9c511..1545d4c 100644 --- a/src/amd/compiler/tests/test_tests.cpp +++ b/src/amd/compiler/tests/test_tests.cpp @@ -36,7 +36,7 @@ BEGIN_TEST_FAIL(expect_fail) fprintf(output, "woops!\n"); END_TEST -BEGIN_TEST(simple.1) +BEGIN_TEST(simple._1) //! s_buffer_load_dwordx2 @s64(a) fprintf(output, "s_buffer_load_dwordx2 s[6:7]\n"); //! s_add_u32 s#b0, s#a, 1 @@ -48,7 +48,7 @@ BEGIN_TEST(simple.1) fprintf(output, "s_buffer_store_dwordx2 s[8:9]\n"); END_TEST -BEGIN_TEST(simple.2) +BEGIN_TEST(simple._2) //~gfx[67]! test gfx67 //~gfx8! test gfx8 //~gfx9! test gfx9 @@ -71,7 +71,7 @@ BEGIN_TEST(simple.2) } END_TEST -BEGIN_TEST(simple.3) +BEGIN_TEST(simple._3) //; funcs['test'] = lambda a: a //! @test(s_buffer_load_dwordx2) @s64(a) fprintf(output, "s_buffer_load_dwordx2 s[6:7]\n"); diff --git a/src/amd/vulkan/.clang-format b/src/amd/vulkan/.clang-format new file mode 100644 index 0000000..658c071 --- /dev/null +++ b/src/amd/vulkan/.clang-format @@ -0,0 +1,3 @@ +BasedOnStyle: InheritParentConfig + +ColumnLimit: 120 diff --git a/src/amd/vulkan/meta/radv_meta_resolve.c b/src/amd/vulkan/meta/radv_meta_resolve.c index 0e66d5e..3893f9a 100644 --- a/src/amd/vulkan/meta/radv_meta_resolve.c +++ b/src/amd/vulkan/meta/radv_meta_resolve.c @@ -874,7 +874,7 @@ radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer, struct radv_imag .levelCount = 1, .baseArrayLayer = src_base_layer, .layerCount = region->srcSubresource.layerCount, - } + }, }; VkSampleLocationsInfoEXT sample_loc_info; diff --git a/src/amd/vulkan/winsys/null/radv_null_winsys.c b/src/amd/vulkan/winsys/null/radv_null_winsys.c index daeddc9..f8453a2 100644 --- a/src/amd/vulkan/winsys/null/radv_null_winsys.c +++ b/src/amd/vulkan/winsys/null/radv_null_winsys.c @@ -37,6 +37,7 @@ static const struct { uint32_t num_render_backends; bool has_dedicated_vram; } gpu_info[] = { + /* clang-format off */ [CHIP_TAHITI] = {0x6780, 8, true}, [CHIP_PITCAIRN] = {0x6800, 8, true}, [CHIP_VERDE] = {0x6820, 4, true}, @@ -69,6 +70,7 @@ static const struct { [CHIP_NAVI22] = {0x73C0, 8, true}, [CHIP_NAVI23] = {0x73E0, 8, true}, [CHIP_GFX1100] = {0x744C, 24, true}, + /* clang-format on */ }; static void -- 2.7.4