From 90015a584bc9f45b5f8a4f094c440196e030e340 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 14 Aug 2024 15:06:08 +0000 Subject: [PATCH] fix(ocloc): disable ocloc output if former ocloc was used in case of fallback to former ocloc, the former ocloc setups outputs Related-To: NEO-12273 Signed-off-by: Mateusz Jablonski --- shared/offline_compiler/source/ocloc_api.cpp | 1 + shared/offline_compiler/source/ocloc_arg_helper.h | 1 + 2 files changed, 2 insertions(+) diff --git a/shared/offline_compiler/source/ocloc_api.cpp b/shared/offline_compiler/source/ocloc_api.cpp index 8a22c09cea..7c58df5d33 100644 --- a/shared/offline_compiler/source/ocloc_api.cpp +++ b/shared/offline_compiler/source/ocloc_api.cpp @@ -58,6 +58,7 @@ int oclocInvoke(unsigned int numArgs, const char *argv[], auto retValFromFormerOcloc = Commands::invokeFormerOcloc(getOclocFormerLibName(), numArgs, argv, numSources, dataSources, lenSources, nameSources, numInputHeaders, dataInputHeaders, lenInputHeaders, nameInputHeaders, numOutputs, dataOutputs, lenOutputs, nameOutputs); if (retValFromFormerOcloc) { retVal = retValFromFormerOcloc.value(); + argHelper->dontSetupOutputs(); } else { argHelper->printf("Couldn't load former ocloc %s\n", getOclocFormerLibName().c_str()); } diff --git a/shared/offline_compiler/source/ocloc_arg_helper.h b/shared/offline_compiler/source/ocloc_arg_helper.h index af5baeca31..3aca7258b0 100644 --- a/shared/offline_compiler/source/ocloc_arg_helper.h +++ b/shared/offline_compiler/source/ocloc_arg_helper.h @@ -84,6 +84,7 @@ class OclocArgHelper { MOCKABLE_VIRTUAL std::vector readBinaryFile(const std::string &filename); MOCKABLE_VIRTUAL std::unique_ptr loadDataFromFile(const std::string &filename, size_t &retSize); + void dontSetupOutputs() { hasOutput = false; } bool outputEnabled() const { return hasOutput; }