P4 to Git Change 1618184 by kzhuravl@kzhuravl-fiji-ocllc-2 on 2018/10/12 14:28:12

SWDEV-125823 - Fix cmake-based opencl build from p4

	//depot/mirrors/amdgcn.git/* changes would be submitted through gerrit.

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#21 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#35 edit
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#14 edit


[ROCm/clr commit: 2dcc063b81]

projects/clr/rocclr/CMakeLists.txt

@@ -46,6 +46,7 @@ add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
 set(BUILD_HC_LIB OFF CACHE BOOL "")
 set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
 set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
+set(AMDGCN_TARGETS_LIB_DEPS "AMDGCN_DEP_TARGETS")
 set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa-amdgizcl")
 add_subdirectory(library/amdgcn EXCLUDE_FROM_ALL)
 

projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp

@@ -5,6 +5,7 @@
 #include "api/v0_8/aclValidation.h"
 #include "libUtils.h"
 #include "bif/bifbase.hpp"
+#include "utils/target_mappings.h"
 #include "utils/versions.hpp"
 #include "utils/options.hpp"
 #include <cstring>

projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.h

@@ -11,7 +11,6 @@
 #include <cassert>
 #include <cstring>
 #include "library.hpp"
-#include "utils/target_mappings.h"
 #include "utils/bif_section_labels.hpp"
 #include "utils/options.hpp"
 using namespace bif;
@@ -264,6 +263,9 @@ aclutUpdateMetadataWithHiddenKernargsNum(aclCompiler* cl, aclBinary* bin, uint32
 }
 #endif
 
+struct _target_mappings_rec;
+typedef _target_mappings_rec TargetMapping;
+
 // Returns the TargetMapping for the specific target device.
 const TargetMapping& getTargetMapping(const aclTargetInfo &target);
 

projects/clr/rocclr/runtime/CMakeLists.txt

@@ -21,6 +21,7 @@ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/tools)
+include_directories(${CMAKE_BINARY_DIR}/runtime/device/rocm)
 
 add_definitions(-DBSD_LIBELF)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
@@ -63,3 +64,11 @@ add_library(oclruntime OBJECT
 )
 set_target_properties(oclruntime PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
+set(AMDGCN_DEP_LIST)
+if(AMDGCN_TARGETS_LIB_DEPS)
+  set(${AMDGCN_TARGETS_LIB_DEPS} ${AMDGCN_DEP_LIST} PARENT_SCOPE)
+endif()
+
+foreach(AMDGCN_DEP_TARGET ${AMDGCN_DEP_TARGETS})
+  add_dependencies(oclruntime ${AMDGCN_DEP_TARGET})
+endforeach()