AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1403108 by lmoriche@lmoriche_palamida on 2017/04/27 00:33:06

Browse Source 
SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
	- Remove the dependency on libHSAIL

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#37 edit
This commit is contained in:
foreman
2017-04-27 00:42:38 -04:00
parent 8e140c9485
commit 5127770544
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/rocm/CMakeLists.txt
-3
View File
@@ -26,9 +26,6 @@ set(headers
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
include_directories(${CMAKE_SOURCE_DIR}/compiler/sc/HSAIL/include)
include_directories(${CMAKE_SOURCE_DIR}/compiler/sc/HSAIL/hsail-tools/libHSAIL)
include_directories(${CMAKE_BINARY_DIR}/compiler/sc/HSAIL/hsail-tools/libHSAIL/generated)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
rocclr/runtime/device/rocm/rocprogram.hpp
-2
View File
@@ -15,7 +15,6 @@
#include <fstream>
#include <iostream>
#include "rocdevice.hpp"
#include "HSAILItems.h"
#if defined(WITH_LIGHTNING_COMPILER)
#include "AMDGPUCodeObjectMetadata.h"
@@ -26,7 +25,6 @@ typedef llvm::AMDGPU::CodeObject::Kernel::Metadata KernelMD;
typedef llvm::AMDGPU::CodeObject::Kernel::Arg::Metadata KernelArgMD;
#endif // defined(WITH_LIGHTNING_COMPILER)
using namespace HSAIL_ASM;
//! \namespace roc HSA Device Implementation
namespace roc {
rocclr/runtime/device/rocm/rocvirtual.cpp
+4 -2
View File
@@ -19,6 +19,7 @@
#include <fstream>
#include <vector>
#include <string>
#include <limits>
/**
* HSA image object size in bytes (see HSAIL spec)
@@ -487,8 +488,9 @@ bool VirtualGPU::create(bool profilingEna) {
// Pick a reasonable queue size
uint32_t queue_size = 1024;
queue_size = (queue_max_packets < queue_size) ? queue_max_packets : queue_size;
while (hsa_queue_create(gpu_device_, queue_size, HSA_QUEUE_TYPE_MULTI, nullptr, nullptr, UINT_MAX,
UINT_MAX, &gpu_queue_) != HSA_STATUS_SUCCESS) {
while (hsa_queue_create(gpu_device_, queue_size, HSA_QUEUE_TYPE_MULTI, nullptr, nullptr,
std::numeric_limits<uint>::max(), std::numeric_limits<uint>::max(),
&gpu_queue_) != HSA_STATUS_SUCCESS) {
queue_size >>= 1;
if (queue_size < 64) {
return false;