From fb014423c941d6dd35ae8c06c39ca549ebc5fe92 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 28 Oct 2015 09:18:54 -0400 Subject: [PATCH] P4 to Git Change 1204812 by nhaustov@nhaustov_hsa on 2015/10/28 09:08:46 SWDEV-79309 - Remove dependency on scwrapper. Testing: smoke, pre-checkin Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/acl.cpp#36 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#82 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/hsail_be.cpp#57 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#12 edit [ROCm/clr commit: 99906c0e052eb99489461d88471829ee61adbba9] --- .../rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp | 7 ------- projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp index 9c11bedaba..801166fb02 100644 --- a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp +++ b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp @@ -23,7 +23,6 @@ #include "amdil_be.hpp" #include "hsail_be.hpp" #include "x86_be.hpp" -#include "scCompileBase.h" #include "bif/bifbase.hpp" #include "os/os.hpp" #include "utils/bif_section_labels.hpp" @@ -825,12 +824,6 @@ HSAILAsmPhase(aclLoaderData *data, if (acl == NULL) { error_code = ACL_CODEGEN_ERROR; } - SC_EXPORT_FUNCTIONS* scef = reinterpret_cast(acl->CL()->scAPI.scef); - if (scef[SC_HSAIL].SCCreate == NULL) { - // Fail if table has not been initialized, probably because dynamic SC has not been loaded. - // In this case, aclSCLoaderInit returns ACL_SUCCESS. - return ACL_CODEGEN_ERROR; - } if (acl->finalize()) { error_code = ACL_CODEGEN_ERROR; } diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp b/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp index 55ec087c94..e4714be778 100644 --- a/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp +++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp @@ -8,7 +8,6 @@ #include "utils/target_mappings.h" #include "utils/versions.hpp" #include "utils/options.hpp" -#include "backends/gpu/scwrapper/devState.h" #include #include "bif/bif.hpp" extern aclBinary* constructBinary(size_t struct_version, @@ -405,7 +404,7 @@ aclutInsertKernelStatistics(aclCompiler *cl, aclBinary *bin) else { aclGetKstatsSI(isa, kstats); } - kstats.wavefrontsize = amdcl::GetWavefrontSize(family, chip); + kstats.wavefrontsize = 64; // FIXME: Hardcoded for now. const oclBIFSymbolStruct* symbol = findBIF30SymStruct(symKernelStats); assert(symbol && "symbol not found"); std::string symName = std::string(symbol->str[PRE]) + std::string(symbol->str[POST]);