From 0342902eff75d2ec1f626d8a21433a25bc844d01 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 16 Jan 2015 14:15:34 -0500 Subject: [PATCH] P4 to Git Change 1112415 by smekhano@stas-moonshine-llvm-merge on 2015/01/16 14:05:45 ECR #333753 - HSA Clang: deleted obsolted files after the merge and fixed makefiles Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/build/Makefile.include#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Analysis/FlowSensitive/DataflowSolver.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Analysis/Support/BlkExprDeclBitVector.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Analysis/Visitors/CFGStmtVisitor.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Basic/ConvertUTF.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Basic/OnDiskHashTable.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/Arg.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/ArgList.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/CC1AsOptions.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/CC1AsOptions.td#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/CC1Options.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/OptParser.td#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/OptSpecifier.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/OptTable.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Driver/Option.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Frontend/ChainedIncludesSource.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/include/clang/Lex/PPMutationListener.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/AST/CommentDumper.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/AST/DumpXML.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/AST/MangleNumberingContext.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Basic/ConvertUTF.c#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Basic/ConvertUTFWrapper.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/CodeGen/CGRTTI.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/CodeGen/CGSPIRBlocks.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/CodeGen/CGSPIRBlocks.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/CodeGen/build/Makefile.codegen#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Driver/Arg.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Driver/ArgList.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Driver/CC1AsOptions.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Driver/OptTable.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Driver/Option.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Driver/build/Makefile.driver#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Sema/TargetAttributesSema.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/Sema/TargetAttributesSema.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/clang36/utils/TableGen/OptParserEmitter.cpp#2 delete --- rocclr/runtime/device/gpu/gpusettings.cpp | 24 +++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpusettings.cpp b/rocclr/runtime/device/gpu/gpusettings.cpp index c435491771..62c3d0cf8c 100644 --- a/rocclr/runtime/device/gpu/gpusettings.cpp +++ b/rocclr/runtime/device/gpu/gpusettings.cpp @@ -152,14 +152,6 @@ Settings::create( // Disable thread trace by default for all devices threadTraceEnable_ = false; - // Save resource cache size -#ifdef ATI_OS_LINUX - // Due to EPR#406216, set the default value for Linux for now - resourceCacheSize_ = GPU_RESOURCE_CACHE_SIZE * Mi; -#else - resourceCacheSize_ = std::max((calAttr.localRAM / 8) * Mi, GPU_RESOURCE_CACHE_SIZE * Mi); -#endif - if (calAttr.doublePrecision) { // Report FP_FAST_FMA define if double precision HW reportFMA_ = true; @@ -453,6 +445,22 @@ Settings::create( remoteAlloc_ = true; } + // Save resource cache size +#ifdef ATI_OS_LINUX + // Due to EPR#406216, set the default value for Linux for now + resourceCacheSize_ = GPU_RESOURCE_CACHE_SIZE * Mi; +#else + if (remoteAlloc_) { + resourceCacheSize_ = std::max((calAttr.uncachedRemoteRAM / 8) * Mi, + GPU_RESOURCE_CACHE_SIZE * Mi); + } + else { + resourceCacheSize_ = std::max((calAttr.localRAM / 8) * Mi, + GPU_RESOURCE_CACHE_SIZE * Mi); + } + resourceCacheSize_ = std::min(resourceCacheSize_, 512 * Mi); +#endif + // Override current device settings override();