P4 to Git Change 1185639 by nhaustov@nhaustov_hsa on 2015/08/28 07:32:17

ECR #333756 - Restore dump ISA/disassemble for HSAIL.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#75 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/hsail_be.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/hsail_be.hpp#14 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.hpp#17 edit
... //depot/stg/opencl/drivers/opencl/tests/hsa/src/complib/env/AMD_DEBUG_DUMP_ISA_ALL_KERNELS/AMD_DEBUG_DUMP_ISA_ALL_KERNELS.cfg#2 delete
... //depot/stg/opencl/drivers/opencl/tests/hsa/src/complib/env/AMD_DEBUG_DUMP_ISA_ALL_KERNELS/AMD_DEBUG_DUMP_ISA_ALL_KERNELS.known#2 delete
... //depot/stg/opencl/drivers/opencl/tests/hsa/src/complib/input/hsail/HelloWorld_Kernel/HelloWorld_Kernel.known#3 delete
... //depot/stg/opencl/drivers/opencl/tests/hsa/src/complib/input/hsail/HelloWorld_Kernel_g/HelloWorld_Kernel_g.known#3 delete
... //depot/stg/opencl/drivers/opencl/tests/hsa/src/complib/options/simple.cl#1 add
... //depot/stg/opencl/drivers/opencl/tests/hsa/tlst/complib.tlst#14 edit

rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp

@@ -872,7 +872,7 @@ HSAILDisassemble(aclLoaderData *data,
   if (acl == NULL) {
     return ACL_INVALID_ARG;
   }
-  isaDump = acl->disassemble(isa_code, isa_size);
+  isaDump = acl->disassemble(isa_code, isa_size, kernel);
   const oclBIFSymbolStruct* symbol = findBIF30SymStruct(symISAText);
   assert(symbol && "symbol not found");
   isaName = symbol->str[PRE] + std::string(kernel) + symbol->str[POST];

rocclr/compiler/lib/utils/options.hpp

@@ -155,7 +155,7 @@ enum DumpFlags {
     DUMP_CL            = 0x00000001,   // CL source
     DUMP_I             = 0x00000002,   // pre-processed CL source
     DUMP_S             = 0x00000004,   // x86 assembly text
-    DUMP_O             = 0x00000008,   // x86 object
+    DUMP_O             = 0x00000008,   // x86 object / GPU code object
     DUMP_DLL           = 0x00000010,   // x86 DLL (.so)
     DUMP_IL            = 0x00000020,   // per-kernel IL (GPU)
     DUMP_ISA           = 0x00000040,   // per-kernel assembly text (GPU)