diff --git a/src/amd/compiler/tests/helpers.cpp b/src/amd/compiler/tests/helpers.cpp
index ca698e78d1a..80d8eac02b9 100644
--- a/src/amd/compiler/tests/helpers.cpp
+++ b/src/amd/compiler/tests/helpers.cpp
@@ -124,19 +124,19 @@ bool setup_cs(const char *input_spec, enum chip_class chip_class,
    return true;
 }
 
-void finish_program(Program *program)
+void finish_program(Program *prog)
 {
-   for (Block& BB : program->blocks) {
+   for (Block& BB : prog->blocks) {
       for (unsigned idx : BB.linear_preds)
-         program->blocks[idx].linear_succs.emplace_back(BB.index);
+         prog->blocks[idx].linear_succs.emplace_back(BB.index);
       for (unsigned idx : BB.logical_preds)
-         program->blocks[idx].logical_succs.emplace_back(BB.index);
+         prog->blocks[idx].logical_succs.emplace_back(BB.index);
    }
 
-   for (Block& block : program->blocks) {
+   for (Block& block : prog->blocks) {
       if (block.linear_succs.size() == 0) {
          block.kind |= block_kind_uniform;
-         Builder(program, &block).sopp(aco_opcode::s_endpgm);
+         Builder(prog, &block).sopp(aco_opcode::s_endpgm);
       }
    }
 }
@@ -335,17 +335,17 @@ void print_pipeline_ir(VkDevice device, VkPipeline pipeline, VkShaderStageFlagBi
    }
 }
 
-VkShaderModule __qoCreateShaderModule(VkDevice dev, const QoShaderModuleCreateInfo *info)
+VkShaderModule __qoCreateShaderModule(VkDevice dev, const QoShaderModuleCreateInfo *module_info)
 {
-    VkShaderModuleCreateInfo module_info;
-    module_info.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
-    module_info.pNext = NULL;
-    module_info.flags = 0;
-    module_info.codeSize = info->spirvSize;
-    module_info.pCode = (const uint32_t*)info->pSpirv;
+    VkShaderModuleCreateInfo vk_module_info;
+    vk_module_info.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
+    vk_module_info.pNext = NULL;
+    vk_module_info.flags = 0;
+    vk_module_info.codeSize = module_info->spirvSize;
+    vk_module_info.pCode = (const uint32_t*)module_info->pSpirv;
 
     VkShaderModule module;
-    VkResult result = CreateShaderModule(dev, &module_info, NULL, &module);
+    VkResult result = CreateShaderModule(dev, &vk_module_info, NULL, &module);
     assert(result == VK_SUCCESS);
 
     return module;
@@ -764,9 +764,9 @@ void PipelineBuilder::create_pipeline() {
       create_graphics_pipeline();
 }
 
-void PipelineBuilder::print_ir(VkShaderStageFlagBits stages, const char *name, bool remove_encoding)
+void PipelineBuilder::print_ir(VkShaderStageFlagBits stage_flags, const char *name, bool remove_encoding)
 {
    if (!pipeline)
       create_pipeline();
-   print_pipeline_ir(device, pipeline, stages, name, remove_encoding);
+   print_pipeline_ir(device, pipeline, stage_flags, name, remove_encoding);
 }
diff --git a/src/amd/compiler/tests/test_isel.cpp b/src/amd/compiler/tests/test_isel.cpp
index a2212b3d8d3..597e543c8e6 100644
--- a/src/amd/compiler/tests/test_isel.cpp
+++ b/src/amd/compiler/tests/test_isel.cpp
@@ -51,9 +51,9 @@ BEGIN_TEST(isel.interp.simple)
       }
    );
 
-   PipelineBuilder bld(get_vk_device(GFX9));
-   bld.add_vsfs(vs, fs);
-   bld.print_ir(VK_SHADER_STAGE_FRAGMENT_BIT, "ACO IR");
+   PipelineBuilder pbld(get_vk_device(GFX9));
+   pbld.add_vsfs(vs, fs);
+   pbld.print_ir(VK_SHADER_STAGE_FRAGMENT_BIT, "ACO IR");
 END_TEST
 
 BEGIN_TEST(isel.compute.simple)
@@ -73,8 +73,8 @@ BEGIN_TEST(isel.compute.simple)
          }
       );
 
-      PipelineBuilder bld(get_vk_device((chip_class)i));
-      bld.add_cs(cs);
-      bld.print_ir(VK_SHADER_STAGE_COMPUTE_BIT, "ACO IR", true);
+      PipelineBuilder pbld(get_vk_device((chip_class)i));
+      pbld.add_cs(cs);
+      pbld.print_ir(VK_SHADER_STAGE_COMPUTE_BIT, "ACO IR", true);
    }
 END_TEST
diff --git a/src/amd/vulkan/vk_format.h b/src/amd/vulkan/vk_format.h
index f6ea6276d65..b46093c56b7 100644
--- a/src/amd/vulkan/vk_format.h
+++ b/src/amd/vulkan/vk_format.h
@@ -147,7 +147,11 @@ struct vk_format_description
 
 extern const struct vk_format_description vk_format_description_table[];
 
+/* Silence warnings triggered by sharing function/struct names */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
 const struct vk_format_description *vk_format_description(VkFormat format);
+#pragma GCC diagnostic pop
 
 /**
  * Return total bits needed for the pixel format per block.