From e297d6768b136ab423094279bc48df36b8127361 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 16 Aug 2017 02:27:50 -0400 Subject: [PATCH] P4 to Git Change 1447790 by lmoriche@lmoriche_opencl_dev2 on 2017/08/16 02:14:56 SWDEV-127386 - Revert to HSAIL instead of LC - Make it possible to override the path to components used by OpenCL by using variables. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#159 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/complibdefs#9 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#52 edit ... //depot/stg/opencl/drivers/opencl/opencldefs#209 edit ... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#69 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#18 edit [ROCm/clr commit: 1f16a55a7bd461e72c21d91d4b828a5f8ffd1fca] --- projects/clr/rocclr/compiler/lib/complibdefs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/compiler/lib/complibdefs b/projects/clr/rocclr/compiler/lib/complibdefs index 64e0a96a74..500f266b35 100644 --- a/projects/clr/rocclr/compiler/lib/complibdefs +++ b/projects/clr/rocclr/compiler/lib/complibdefs @@ -66,8 +66,13 @@ GCPPFLAGS += $(DEFSWITCH) "BREAK_ON_LOG_ERROR=0" GCPPFLAGS += $(DEFSWITCH) "LOG_LEVEL=2" GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/device/gpu/gslbe/src/rt" -GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc/asic_reg/3D/r600" -GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc/asic_reg/3D/r800" + +ASIC_REG_DEPTH ?= $(DEPTH)/drivers/inc/asic_reg +COMPILER_SRC_INC_ASICREG_3D_R600_DIR ?= $(ASIC_REG_DEPTH)/3D/r600 +COMPILER_SRC_INC_ASICREG_3D_R800_DIR ?= $(ASIC_REG_DEPTH)/3D/r800 + +GCPPFLAGS += $(INCSWITCH) "$(COMPILER_SRC_INC_ASICREG_3D_R600_DIR)" +GCPPFLAGS += $(INCSWITCH) "$(COMPILER_SRC_INC_ASICREG_3D_R800_DIR)" GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/si/include/asic" export BRIG_ENABLE=1