From 90339a205ff0060efce4cc231ddcd0074eb938f2 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 25 Sep 2018 12:03:21 -0400 Subject: [PATCH] P4 to Git Change 1610376 by gandryey@gera-w8 on 2018/09/25 11:50:37 SWDEV-79445 - OCL generic changes and code clean-up - Fix HIP failures Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#5 edit --- rocclr/runtime/device/devprogram.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp index cea0041820..509476932d 100644 --- a/rocclr/runtime/device/devprogram.cpp +++ b/rocclr/runtime/device/devprogram.cpp @@ -1092,7 +1092,6 @@ aclType Program::getCompilationStagesFromBinary(std::vector& completeSt if (isLC()) { #if defined(WITH_LIGHTNING_COMPILER) completeStages.clear(); - aclType from = ACL_TYPE_DEFAULT; needOptionsCheck = true; //! @todo Should we also check for ACL_TYPE_OPENCL & ACL_TYPE_LLVMIR_TEXT? // Checking llvmir in .llvmir section @@ -1352,7 +1351,9 @@ aclType Program::getNextCompilationStageFromBinary(amd::option::Options* options if (recompile) { while (!completeStages.empty()) { continueCompileFrom = completeStages.back(); - if (continueCompileFrom == ACL_TYPE_LLVMIR_BINARY || + if (continueCompileFrom == ACL_TYPE_SPIRV_BINARY || + continueCompileFrom == ACL_TYPE_LLVMIR_BINARY || + continueCompileFrom == ACL_TYPE_SPIR_BINARY || continueCompileFrom == ACL_TYPE_DEFAULT) { break; }