From b076dfd8eae8c626d83c61630ee04ce10493709d Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 11 Aug 2017 17:09:47 -0400 Subject: [PATCH] P4 to Git Change 1446389 by lmoriche@lmoriche_opencl_dev2 on 2017/08/11 16:56:26 SWDEV-127386 - Revert to HSAIL instead of LC - Fixes the asic_reg include files paths. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/api/v0_8/aclKstatsr800.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/devState7XX.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/scState7XX.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/devStateEGNI.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scCompile89.cpp#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scStateEGNI.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/SI/devStateSI.cpp#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/SI/scStateSI.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/devState.cpp#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/complibdefs#8 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil.h#18 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil64.h#17 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#18 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#18 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/aclKstatsr800.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#51 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#44 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#40 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#43 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#38 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/build/Makefile.binary#22 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/build/Makefile.complib#40 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/spir/build/Makefile.spir#16 edit --- rocclr/compiler/lib/complibdefs | 3 +-- .../lib/utils/v0_8/target_mappings_amdil.h | 24 +++++++++---------- .../lib/utils/v0_8/target_mappings_amdil64.h | 12 +++++----- .../lib/utils/v0_8/target_mappings_hsail.h | 14 +++++------ .../lib/utils/v0_8/target_mappings_hsail64.h | 12 +++++----- 5 files changed, 32 insertions(+), 33 deletions(-) diff --git a/rocclr/compiler/lib/complibdefs b/rocclr/compiler/lib/complibdefs index e9904bfa49..64e0a96a74 100644 --- a/rocclr/compiler/lib/complibdefs +++ b/rocclr/compiler/lib/complibdefs @@ -42,8 +42,7 @@ endif endif endif -GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers" -GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc/asic_reg" +GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc" GCPPFLAGS += $(INCSWITCH) "$(COMPLIB_DEPTH)" GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime" GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/utils" diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h index 29cd571a8b..be37ed9050 100644 --- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h +++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h @@ -4,18 +4,18 @@ #ifndef _CL_UTILS_TARGET_MAPPINGS_AMDIL_0_8_H_ #define _CL_UTILS_TARGET_MAPPINGS_AMDIL_0_8_H_ -#include "inc/asic_reg/evergreen_id.h" -#include "inc/asic_reg/r700id.h" -#include "inc/asic_reg/tn_id.h" -#include "inc/asic_reg/sumo_id.h" -#include "inc/asic_reg/northernisland_id.h" -#include "inc/asic_reg/si_id.h" -#include "inc/asic_reg/kv_id.h" -#include "inc/asic_reg/ci_id.h" -#include "inc/asic_reg/vi_id.h" -#include "inc/asic_reg/cz_id.h" -#include "inc/asic_reg/ai_id.h" -#include "inc/asic_reg/atiid.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" static const TargetMapping AMDILTargetMapping_0_8[] = { UnknownTarget, diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h index d85cafe89c..037d6527ae 100644 --- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h +++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h @@ -4,12 +4,12 @@ #ifndef _CL_UTILS_TARGET_MAPPINGS_AMDIL64_0_8_H_ #define _CL_UTILS_TARGET_MAPPINGS_AMDIL64_0_8_H_ -#include "inc/asic_reg/si_id.h" -#include "inc/asic_reg/kv_id.h" -#include "inc/asic_reg/ci_id.h" -#include "inc/asic_reg/vi_id.h" -#include "inc/asic_reg/cz_id.h" -#include "inc/asic_reg/atiid.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" static const TargetMapping AMDIL64TargetMapping_0_8[] = { UnknownTarget, diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h index 45e9c2cc68..bbea482e0d 100644 --- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h +++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h @@ -4,13 +4,13 @@ #ifndef _CL_UTILS_TARGET_MAPPINGS_HSAIL_0_8_H_ #define _CL_UTILS_TARGET_MAPPINGS_HSAIL_0_8_H_ -#include "inc/asic_reg/si_id.h" -#include "inc/asic_reg/kv_id.h" -#include "inc/asic_reg/ci_id.h" -#include "inc/asic_reg/cz_id.h" -#include "inc/asic_reg/ai_id.h" -#include "inc/asic_reg/rv_id.h" -#include "inc/asic_reg/atiid.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" static const TargetMapping HSAILTargetMapping_0_8[] = { UnknownTarget, diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h index cef5f2bc4a..2080140a28 100644 --- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h +++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h @@ -4,12 +4,12 @@ #ifndef _CL_UTILS_TARGET_MAPPINGS_HSAIL64_0_8_H_ #define _CL_UTILS_TARGET_MAPPINGS_HSAIL64_0_8_H_ -#include "inc/asic_reg/si_id.h" -#include "inc/asic_reg/kv_id.h" -#include "inc/asic_reg/ci_id.h" -#include "inc/asic_reg/ai_id.h" -#include "inc/asic_reg/rv_id.h" -#include "inc/asic_reg/atiid.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" static const TargetMapping HSAIL64TargetMapping_0_8[] = { UnknownTarget,