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

P4 to Git Change 1448192 by lmoriche@lmoriche_opencl_dev2 on 2017/08/16 18:31:50

Browse Source 
SWDEV-127386 - Revert to HSAIL instead of LC
	- More asic_reg path fixes (remove asic_reg/ prefix)
	- Add LIQUID_FLASH_INCS/LOPTS/LLIBS variables
	- Add HSA_RUNTIME_INCS/LOPTS/LLIBS variables
	- Add ASIC_REG_INCS variable

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#160 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/api/v0_8/aclKstatsr800.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/devState7XX.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/scState7XX.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/devStateEGNI.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scCompile89.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scStateEGNI.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/SI/devStateSI.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/SI/scStateSI.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/devState.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/complibdefs#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil.h#20 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil64.h#19 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#20 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#20 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/aclKstatsr800.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#53 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#46 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#42 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#45 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#40 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#210 edit
... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#70 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/build/Makefile.gpu#69 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/build/Makefile.backend#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/build/Makefile.pal#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#70 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/build/Makefile.binary#23 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/build/Makefile.complib#41 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/spir/build/Makefile.spir#17 edit
This commit is contained in:
foreman
2017-08-16 18:45:30 -04:00
parent 804fab7700
commit 0196394dcf
6 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/compiler/lib/complibdefs
+2 -8
View File
@@ -42,7 +42,7 @@ endif
endif
endif
GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc"
GCPPFLAGS += $(ASIC_REG_INCS)
GCPPFLAGS += $(INCSWITCH) "$(COMPLIB_DEPTH)"
GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime"
GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/utils"
@@ -66,14 +66,8 @@ GCPPFLAGS += $(DEFSWITCH) "BREAK_ON_LOG_ERROR=0"
GCPPFLAGS += $(DEFSWITCH) "LOG_LEVEL=2"
GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/device/gpu/gslbe/src/rt"
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
ifdef ATI_OS_WINDOWS
rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
+12 -12
View File
@@ -4,18 +4,18 @@
#ifndef _CL_UTILS_TARGET_MAPPINGS_AMDIL_0_8_H_
#define _CL_UTILS_TARGET_MAPPINGS_AMDIL_0_8_H_
#include "asic_reg/evergreen_id.h"
#include "asic_reg/r700id.h"
#include "asic_reg/tn_id.h"
#include "asic_reg/sumo_id.h"
#include "asic_reg/northernisland_id.h"
#include "asic_reg/si_id.h"
#include "asic_reg/kv_id.h"
#include "asic_reg/ci_id.h"
#include "asic_reg/vi_id.h"
#include "asic_reg/cz_id.h"
#include "asic_reg/ai_id.h"
#include "asic_reg/atiid.h"
#include "evergreen_id.h"
#include "r700id.h"
#include "tn_id.h"
#include "sumo_id.h"
#include "northernisland_id.h"
#include "si_id.h"
#include "kv_id.h"
#include "ci_id.h"
#include "vi_id.h"
#include "cz_id.h"
#include "ai_id.h"
#include "atiid.h"
static const TargetMapping AMDILTargetMapping_0_8[] = {
UnknownTarget,
rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
+6 -6
View File
@@ -4,12 +4,12 @@
#ifndef _CL_UTILS_TARGET_MAPPINGS_AMDIL64_0_8_H_
#define _CL_UTILS_TARGET_MAPPINGS_AMDIL64_0_8_H_
#include "asic_reg/si_id.h"
#include "asic_reg/kv_id.h"
#include "asic_reg/ci_id.h"
#include "asic_reg/vi_id.h"
#include "asic_reg/cz_id.h"
#include "asic_reg/atiid.h"
#include "si_id.h"
#include "kv_id.h"
#include "ci_id.h"
#include "vi_id.h"
#include "cz_id.h"
#include "atiid.h"
static const TargetMapping AMDIL64TargetMapping_0_8[] = {
UnknownTarget,
rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
+7 -7
View File
@@ -4,13 +4,13 @@
#ifndef _CL_UTILS_TARGET_MAPPINGS_HSAIL_0_8_H_
#define _CL_UTILS_TARGET_MAPPINGS_HSAIL_0_8_H_
#include "asic_reg/si_id.h"
#include "asic_reg/kv_id.h"
#include "asic_reg/ci_id.h"
#include "asic_reg/cz_id.h"
#include "asic_reg/ai_id.h"
#include "asic_reg/rv_id.h"
#include "asic_reg/atiid.h"
#include "si_id.h"
#include "kv_id.h"
#include "ci_id.h"
#include "cz_id.h"
#include "ai_id.h"
#include "rv_id.h"
#include "atiid.h"
static const TargetMapping HSAILTargetMapping_0_8[] = {
UnknownTarget,
rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
+6 -6
View File
@@ -4,12 +4,12 @@
#ifndef _CL_UTILS_TARGET_MAPPINGS_HSAIL64_0_8_H_
#define _CL_UTILS_TARGET_MAPPINGS_HSAIL64_0_8_H_
#include "asic_reg/si_id.h"
#include "asic_reg/kv_id.h"
#include "asic_reg/ci_id.h"
#include "asic_reg/ai_id.h"
#include "asic_reg/rv_id.h"
#include "asic_reg/atiid.h"
#include "si_id.h"
#include "kv_id.h"
#include "ci_id.h"
#include "ai_id.h"
#include "rv_id.h"
#include "atiid.h"
static const TargetMapping HSAIL64TargetMapping_0_8[] = {
UnknownTarget,
rocclr/runtime/device/rocm/rocprogram.cpp
-1
View File
@@ -16,7 +16,6 @@
#include <gelf.h>
#else // !defined(WITH_LIGHTNING_COMPILER)
#include "roccompilerlib.hpp"
#include "amd_hsa_code.hpp"
#endif // !defined(WITH_LIGHTNING_COMPILER)
#include "utils/bif_section_labels.hpp"