diff --git a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
index 56247d6f02..e3197c9231 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
@@ -1155,9 +1155,6 @@ aclCompileInternal(
             goto internal_compile_failure;
           }
         }
-        if (acl->Options()->isDumpFlagSet(amd::option::DUMP_CGIL)) {
-          acl->dumpHSAIL(acl->disassembleBRIG(), ".hsail");
-        }
       }
       // HSAIL substitution from AMD_DEBUG_HSAIL_TEXT_INPUT
       else {
@@ -1202,6 +1199,10 @@ aclCompileInternal(
           goto internal_compile_failure;
         }
       }
+      char* dumpFileName = ::getenv("AMD_DEBUG_DUMP_HSAIL_ALL_KERNELS");
+      if (acl->Options()->isDumpFlagSet(amd::option::DUMP_CGIL) || dumpFileName) {
+        acl->dumpHSAIL(acl->disassembleBRIG(), ".hsail");
+      }
       bifbase *elfBin = reinterpret_cast<bifbase*>(bin->bin);
       elfBin->setType(ET_EXEC);
     } else