From b82c92dbc7510b8cd0fd7a5063287d4a2fdeb440 Mon Sep 17 00:00:00 2001 From: foreman Date: Sun, 3 Feb 2019 16:55:44 -0500 Subject: [PATCH] P4 to Git Change 1739393 by kzhuravl@kzhuravl-fiji-ocllc-2 on 2019/02/03 16:46:26 SWDEV-178312 - Clean pre-GCN references Change by Roland Ouellette Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/api/v0_8/aclKstatsr800.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/amdil_be.cpp#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/devState7XX.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/devState7XX.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/scCompile7XX.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/scCompile7XX.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/scState7XX.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/7XX/scState7XX.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/devStateEGNI.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/devStateEGNI.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scCompile89.cpp#6 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scCompile89.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scStateEGNI.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/EGNI/scStateEGNI.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/devState.cpp#7 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/scCompile789.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/scCompile789.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/scCompileBase.cpp#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/scState.cpp#9 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/scState.h#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/include/v0_8/acl.h#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/libUtils.cpp#11 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/aclKstatsr800.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/amdil_be.cpp#46 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/acl.h#13 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#36 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#335 edit --- rocclr/compiler/lib/include/v0_8/acl.h | 2 -- rocclr/compiler/lib/utils/v0_8/libUtils.cpp | 7 +------ rocclr/runtime/device/gpu/gpukernel.cpp | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/rocclr/compiler/lib/include/v0_8/acl.h b/rocclr/compiler/lib/include/v0_8/acl.h index ba2669196c..4c44eb0fee 100644 --- a/rocclr/compiler/lib/include/v0_8/acl.h +++ b/rocclr/compiler/lib/include/v0_8/acl.h @@ -282,8 +282,6 @@ void aclDumpBinary(const aclBinary *bin); //!--------------------------------------------------------------------------!// // Functions that deal with kenel statistics. //!--------------------------------------------------------------------------!// -void aclGetKstatsR800(const void* shader, - aclKernelStats &kstats, const char* chip_id); void aclGetKstatsSI(const void* shader, aclKernelStats &kstats); acl_error ACL_API_ENTRY diff --git a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp index a92192b33b..7f0cd50697 100644 --- a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp +++ b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp @@ -413,12 +413,7 @@ aclutInsertKernelStatistics(aclCompiler *cl, aclBinary *bin) if (family >= FAMILY_R600 && family <= FAMILY_CZ) { aclKernelStats kstats = {0}; - if (family < FAMILY_SI) { - aclGetKstatsR800(isa, kstats, chipName); - } - else { - aclGetKstatsSI(isa, kstats); - } + aclGetKstatsSI(isa, kstats); kstats.wavefrontsize = 64; // FIXME: Hardcoded for now. const oclBIFSymbolStruct* symbol = findBIF30SymStruct(symKernelStats); assert(symbol && "symbol not found"); diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp index a6857b39e2..8eb574eed6 100644 --- a/rocclr/runtime/device/gpu/gpukernel.cpp +++ b/rocclr/runtime/device/gpu/gpukernel.cpp @@ -12,7 +12,7 @@ #include "utils/options.hpp" #include "acl.h" -#include "SCShadersR678XXCommon.h" +#include "SCCommon.h" #include #include