diff --git a/src/kosmickrisp/compiler/msl_private.h b/src/kosmickrisp/compiler/msl_private.h
index 9ccd2bd7922..32fbfda8348 100644
--- a/src/kosmickrisp/compiler/msl_private.h
+++ b/src/kosmickrisp/compiler/msl_private.h
@@ -22,6 +22,7 @@ struct nir_to_msl_ctx {
    struct hash_table *types;
    nir_shader *shader;
    struct _mesa_string_buffer *text;
+   uint64_t disabled_workarounds;
    unsigned short indentlevel;
    struct io_slot_info inputs_info[NUM_TOTAL_VARYING_SLOTS];
    struct io_slot_info outputs_info[NUM_TOTAL_VARYING_SLOTS];
diff --git a/src/kosmickrisp/compiler/nir_to_msl.c b/src/kosmickrisp/compiler/nir_to_msl.c
index 55159c836c2..e49a48f21ea 100644
--- a/src/kosmickrisp/compiler/nir_to_msl.c
+++ b/src/kosmickrisp/compiler/nir_to_msl.c
@@ -112,7 +112,11 @@ emit_local_vars(struct nir_to_msl_ctx *ctx, nir_shader *shader)
    }
    if (shader->scratch_size) {
       /* KK_WORKAROUND_1 */
-      P_IND(ctx, "uchar scratch[%d] = {0};\n", shader->scratch_size);
+      if (ctx->disabled_workarounds & BITFIELD64_BIT(1)) {
+         P_IND(ctx, "uchar scratch[%d];\n", shader->scratch_size);
+      } else {
+         P_IND(ctx, "uchar scratch[%d] = {0};\n", shader->scratch_size);
+      }
    }
    if (BITSET_TEST(shader->info.system_values_read,
                    SYSTEM_VALUE_HELPER_INVOCATION)) {
@@ -124,8 +128,7 @@ static bool
 is_register(nir_def *def)
 {
    return ((nir_def_is_intrinsic(def)) &&
-           (nir_def_as_intrinsic(def)->intrinsic ==
-            nir_intrinsic_load_reg));
+           (nir_def_as_intrinsic(def)->intrinsic == nir_intrinsic_load_reg));
 }
 
 static void
@@ -167,8 +170,7 @@ src_to_msl(struct nir_to_msl_ctx *ctx, nir_src *src)
    if (bitcast)
       P(ctx, "as_type<%s>(", bitcast);
    if (is_register(src->ssa)) {
-      nir_intrinsic_instr *instr =
-         nir_def_as_intrinsic(src->ssa);
+      nir_intrinsic_instr *instr = nir_def_as_intrinsic(src->ssa);
       if (src->ssa->bit_size != 1u) {
          P(ctx, "as_type<%s>(r%d)", msl_type_for_def(ctx->types, src->ssa),
            instr->src[0].ssa->index);
@@ -1357,7 +1359,11 @@ intrinsic_to_msl(struct nir_to_msl_ctx *ctx, nir_intrinsic_instr *instr)
       break;
    case nir_intrinsic_elect:
       /* KK_WORKAROUND_3 */
-      P(ctx, "simd_is_first() && (ulong)simd_ballot(true);\n");
+      if (ctx->disabled_workarounds & BITFIELD64_BIT(3)) {
+         P(ctx, "simd_is_first();\n");
+      } else {
+         P(ctx, "simd_is_first() && (ulong)simd_ballot(true);\n");
+      }
       break;
    case nir_intrinsic_read_first_invocation:
       P(ctx, "simd_broadcast_first(");
@@ -1782,10 +1788,14 @@ cf_node_to_metal(struct nir_to_msl_ctx *ctx, nir_cf_node *node)
       nir_loop *loop = nir_cf_node_as_loop(node);
       assert(!nir_loop_has_continue_construct(loop));
       /* KK_WORKAROUND_2 */
-      P_IND(ctx,
-            "for (uint64_t no_crash = 0u; no_crash < %" PRIu64
-            "; ++no_crash) {\n",
-            UINT64_MAX);
+      if (ctx->disabled_workarounds & BITFIELD64_BIT(2)) {
+         P_IND(ctx, "while (true) {\n");
+      } else {
+         P_IND(ctx,
+               "for (uint64_t no_crash = 0u; no_crash < %" PRIu64
+               "; ++no_crash) {\n",
+               UINT64_MAX);
+      }
       ctx->indentlevel++;
       foreach_list_typed(nir_cf_node, node, node, &loop->body) {
          cf_node_to_metal(ctx, node);
@@ -1979,7 +1989,7 @@ predeclare_ssa_values(struct nir_to_msl_ctx *ctx, nir_function_impl *impl)
 }
 
 char *
-nir_to_msl(nir_shader *shader, void *mem_ctx)
+nir_to_msl(nir_shader *shader, void *mem_ctx, uint64_t disabled_workarounds)
 {
    /* Need to rename the entrypoint here since hardcoded shaders used by vk_meta
     * don't go through the preprocess step since we are the ones creating them.
@@ -1989,6 +1999,7 @@ nir_to_msl(nir_shader *shader, void *mem_ctx)
    struct nir_to_msl_ctx ctx = {
       .shader = shader,
       .text = _mesa_string_buffer_create(mem_ctx, 1024),
+      .disabled_workarounds = disabled_workarounds,
    };
    nir_function_impl *impl = nir_shader_get_entrypoint(shader);
    msl_gather_info(&ctx);
diff --git a/src/kosmickrisp/compiler/nir_to_msl.h b/src/kosmickrisp/compiler/nir_to_msl.h
index 02abf58f66e..62f6d3851be 100644
--- a/src/kosmickrisp/compiler/nir_to_msl.h
+++ b/src/kosmickrisp/compiler/nir_to_msl.h
@@ -11,7 +11,8 @@
 enum pipe_format;
 
 /* Assumes nir_shader_gather_info has been called beforehand. */
-char *nir_to_msl(nir_shader *shader, void *mem_ctx);
+char *nir_to_msl(nir_shader *shader, void *mem_ctx,
+                 uint64_t disabled_workarounds);
 
 /* Call this after all API-specific lowerings. It will bring the NIR out of SSA
  * at the end */
diff --git a/src/kosmickrisp/kosmicomp.c b/src/kosmickrisp/kosmicomp.c
index a45d8203c96..554c6b007d8 100644
--- a/src/kosmickrisp/kosmicomp.c
+++ b/src/kosmickrisp/kosmicomp.c
@@ -177,7 +177,7 @@ main(int argc, char **argv)
    optimize(shader);
    nir_print_shader(shader, stdout);
 
-   char *msl_text = nir_to_msl(shader, shader);
+   char *msl_text = nir_to_msl(shader, shader, 0u);
 
    fputs(msl_text, stdout);
 
diff --git a/src/kosmickrisp/vulkan/kk_device.c b/src/kosmickrisp/vulkan/kk_device.c
index bc2f42f57ca..9ac163a8461 100644
--- a/src/kosmickrisp/vulkan/kk_device.c
+++ b/src/kosmickrisp/vulkan/kk_device.c
@@ -138,6 +138,31 @@ kk_sampler_heap_remove(struct kk_device *dev, struct kk_rc_sampler *rc)
    simple_mtx_unlock(&h->lock);
 }
 
+static void
+kk_parse_device_environment_options(struct kk_device *dev)
+{
+   dev->gpu_capture_enabled =
+      debug_get_bool_option("MESA_KK_GPU_CAPTURE", false);
+   if (dev->gpu_capture_enabled) {
+      const char *capture_directory =
+         debug_get_option("MESA_KK_GPU_CAPTURE_DIRECTORY", NULL);
+      mtl_start_gpu_capture(dev->mtl_handle, capture_directory);
+   }
+
+   const char *list = debug_get_option("MESA_KK_DISABLE_WORKAROUNDS", "");
+   const char *all_workarounds = "all";
+   const size_t all_len = strlen(all_workarounds);
+   for (unsigned n; n = strcspn(list, ","), *list; list += MAX2(1, n)) {
+      if (n == all_len && !strncmp(list, all_workarounds, n)) {
+         dev->disabled_workarounds = UINT64_MAX;
+         break;
+      }
+
+      int index = atoi(list);
+      dev->disabled_workarounds |= BITFIELD64_BIT(index);
+   }
+}
+
 VKAPI_ATTR VkResult VKAPI_CALL
 kk_CreateDevice(VkPhysicalDevice physicalDevice,
                 const VkDeviceCreateInfo *pCreateInfo,
@@ -211,15 +236,9 @@ kk_CreateDevice(VkPhysicalDevice physicalDevice,
    simple_mtx_init(&dev->user_heap_cache.mutex, mtx_plain);
    dev->user_heap_cache.handles = UTIL_DYNARRAY_INIT;
 
-   *pDevice = kk_device_to_handle(dev);
+   kk_parse_device_environment_options(dev);
 
-   dev->gpu_capture_enabled =
-      debug_get_bool_option("MESA_KK_GPU_CAPTURE", false);
-   if (dev->gpu_capture_enabled) {
-      const char *capture_directory =
-         debug_get_option("MESA_KK_GPU_CAPTURE_DIRECTORY", NULL);
-      mtl_start_gpu_capture(dev->mtl_handle, capture_directory);
-   }
+   *pDevice = kk_device_to_handle(dev);
 
    return VK_SUCCESS;
 
diff --git a/src/kosmickrisp/vulkan/kk_device.h b/src/kosmickrisp/vulkan/kk_device.h
index 50e05e934c9..a6c0a323c16 100644
--- a/src/kosmickrisp/vulkan/kk_device.h
+++ b/src/kosmickrisp/vulkan/kk_device.h
@@ -100,6 +100,7 @@ struct kk_device {
 
    struct vk_meta_device meta;
 
+   uint64_t disabled_workarounds;
    bool gpu_capture_enabled;
 };
 
diff --git a/src/kosmickrisp/vulkan/kk_shader.c b/src/kosmickrisp/vulkan/kk_shader.c
index bb0352a65d6..cc8bfa09921 100644
--- a/src/kosmickrisp/vulkan/kk_shader.c
+++ b/src/kosmickrisp/vulkan/kk_shader.c
@@ -652,7 +652,7 @@ kk_compile_shader(struct kk_device *dev, struct vk_shader_compile_info *info,
    }
    msl_optimize_nir(nir);
    modify_nir_info(nir);
-   shader->msl_code = nir_to_msl(nir, NULL);
+   shader->msl_code = nir_to_msl(nir, NULL, dev->disabled_workarounds);
    const char *entrypoint_name = nir_shader_get_entrypoint(nir)->function->name;
 
    /* We need to steal so it doesn't get destroyed with the nir. Needs to happen