P4 to Git Change 2045900 by gandryey@gera-win10 on 2019/12/13 17:41:59

SWDEV-197836 - Drop the use of llvm header files in opencl runtime
	- Eliminate LC driver path from runtime

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#248 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#345 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#74 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#179 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#85 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.cpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#101 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#146 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#109 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#93 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#107 edit

rocclr/runtime/device/rocm/rockernel.cpp

@@ -9,15 +9,12 @@
 
 #ifndef WITHOUT_HSA_BACKEND
 
-#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
-#ifndef USE_COMGR_LIBRARY
-#include "driver/AmdCompiler.h"
-#endif
+#if defined(USE_COMGR_LIBRARY)
 #include "llvm/Support/AMDGPUMetadata.h"
 
 typedef llvm::AMDGPU::HSAMD::Metadata CodeObjectMD;
 typedef llvm::AMDGPU::HSAMD::Kernel::Metadata KernelMD;
-#endif  // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+#endif  // defined(USE_COMGR_LIBRARY)
 
 namespace roc {
 
@@ -40,7 +37,6 @@ Kernel::Kernel(std::string name, Program* prog)
       kernargSegmentByteSize_(0),
       kernargSegmentAlignment_(0) {}
 
-#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
 #if defined(USE_COMGR_LIBRARY)
 bool LightningKernel::init() {
 
@@ -170,131 +166,7 @@ bool LightningKernel::init() {
   }
   return true;
 }
-#else
-static const KernelMD* FindKernelMetadata(const CodeObjectMD* programMD, const std::string& name) {
-  for (const KernelMD& kernelMD : programMD->mKernels) {
-    if (kernelMD.mName == name) {
-      return &kernelMD;
-    }
-  }
-  return nullptr;
-}
-
-bool LightningKernel::init() {
-  hsa_agent_t hsaDevice = program()->hsaDevice();
-
-  // Pull out metadata from the ELF
-  const CodeObjectMD* programMD = static_cast<const LightningProgram*>(program())->metadata();
-  assert(programMD != nullptr);
-
-  const KernelMD* kernelMD = FindKernelMetadata(programMD, name());
-  if (kernelMD == nullptr) {
-    return false;
-  }
-  InitParameters(*kernelMD, KernargSegmentByteSize());
-
-  // Set the workgroup information for the kernel
-  workGroupInfo_.availableLDSSize_ = program()->dev().info().localMemSizePerCU_;
-  assert(workGroupInfo_.availableLDSSize_ > 0);
-  workGroupInfo_.availableSGPRs_ = 104;
-  workGroupInfo_.availableVGPRs_ = 256;
-
-  if (!kernelMD->mAttrs.mReqdWorkGroupSize.empty()) {
-    const auto& requiredWorkgroupSize = kernelMD->mAttrs.mReqdWorkGroupSize;
-    workGroupInfo_.compileSize_[0] = requiredWorkgroupSize[0];
-    workGroupInfo_.compileSize_[1] = requiredWorkgroupSize[1];
-    workGroupInfo_.compileSize_[2] = requiredWorkgroupSize[2];
-  }
-
-  if (!kernelMD->mAttrs.mWorkGroupSizeHint.empty()) {
-    const auto& workgroupSizeHint = kernelMD->mAttrs.mWorkGroupSizeHint;
-    workGroupInfo_.compileSizeHint_[0] = workgroupSizeHint[0];
-    workGroupInfo_.compileSizeHint_[1] = workgroupSizeHint[1];
-    workGroupInfo_.compileSizeHint_[2] = workgroupSizeHint[2];
-  }
-
-  if (!kernelMD->mAttrs.mVecTypeHint.empty()) {
-    workGroupInfo_.compileVecTypeHint_ = kernelMD->mAttrs.mVecTypeHint.c_str();
-  }
-
-  if (!kernelMD->mAttrs.mRuntimeHandle.empty()) {
-    hsa_agent_t             agent = program()->hsaDevice();
-    hsa_executable_symbol_t kernelSymbol;
-    hsa_status_t            status;
-    int                     variable_size;
-    uint64_t                variable_address;
-
-    // Only kernels that could be enqueued by another kernel has the RuntimeHandle metadata. The RuntimeHandle
-    // metadata is a string that represents a variable from which the library code can retrieve the kernel code
-    // object handle of such a kernel. The address of the variable and the kernel code object handle are known
-    // only after the hsa executable is loaded. The below code copies the kernel code object handle to the
-    // address of the variable.
-
-    status = hsa_executable_get_symbol_by_name(program()->hsaExecutable(), kernelMD->mAttrs.mRuntimeHandle.c_str(),
-                                               &agent, &kernelSymbol);
-    if (status != HSA_STATUS_SUCCESS) {
-      return false;
-    }
-
-    status = hsa_executable_symbol_get_info(kernelSymbol, HSA_EXECUTABLE_SYMBOL_INFO_VARIABLE_SIZE,
-                                            &variable_size);
-    if (status != HSA_STATUS_SUCCESS) {
-      return false;
-    }
-
-    status = hsa_executable_symbol_get_info(kernelSymbol, HSA_EXECUTABLE_SYMBOL_INFO_VARIABLE_ADDRESS,
-                                            &variable_address);
-    if (status != HSA_STATUS_SUCCESS) {
-      return false;
-    }
-
-    const struct RuntimeHandle runtime_handle = {
-        kernelCodeHandle_,
-        workitemPrivateSegmentByteSize(),
-        WorkgroupGroupSegmentByteSize()
-    };
-
-    status = hsa_memory_copy(reinterpret_cast<void*>(variable_address), &runtime_handle, variable_size);
-    if (status != HSA_STATUS_SUCCESS) {
-      return false;
-    }
-  }
-
-  uint32_t wavefront_size = 0;
-  if (hsa_agent_get_info(program()->hsaDevice(), HSA_AGENT_INFO_WAVEFRONT_SIZE, &wavefront_size) !=
-      HSA_STATUS_SUCCESS) {
-    return false;
-  }
-  assert(wavefront_size > 0);
-
-  workGroupInfo_.privateMemSize_ = workitemPrivateSegmentByteSize_;
-  workGroupInfo_.localMemSize_ = workgroupGroupSegmentByteSize_;
-  workGroupInfo_.usedLDSSize_ = workgroupGroupSegmentByteSize_;
-
-  workGroupInfo_.preferredSizeMultiple_ = wavefront_size;
-
-  /// TODO: Are there any other fields that are getting queried from akc?
-  /// If so, code properties metadata should be used instead.
-  workGroupInfo_.usedSGPRs_ = kernelMD->mCodeProps.mNumSGPRs;
-  workGroupInfo_.usedVGPRs_ = kernelMD->mCodeProps.mNumVGPRs;
-
-  workGroupInfo_.usedStackSize_ = 0;
-
-  workGroupInfo_.wavefrontPerSIMD_ = program()->dev().info().maxWorkItemSizes_[0] / wavefront_size;
-
-  workGroupInfo_.wavefrontSize_ = wavefront_size;
-
-  workGroupInfo_.size_ = kernelMD->mCodeProps.mMaxFlatWorkGroupSize;
-  if (workGroupInfo_.size_ == 0) {
-    return false;
-  }
-
-  InitPrintf(programMD->mPrintf);
-
-  return true;
-}
 #endif  // defined(USE_COMGR_LIBRARY)
-#endif  // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
 
 #if defined(WITH_COMPILER_LIB)
 bool HSAILKernel::init() {