From 16a5bfd65413da104d39ad02ad5a95eca92da37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Manuel=20MARTINEZ=20CAAMA=C3=91O?= Date: Thu, 12 Jan 2023 17:46:39 +0100 Subject: [PATCH] SWDEV-287018 - Remove `requiredDump` argument from `Program::linkLLVMBitcode` Weirdly, the `requiredDump` argument to linkLLVMBitcode was used to enable/disable the keeping temporary bytecode files (those generated by -save-temps=all) after linking. This patch removes this argument as there is no obvious benefit from keepeing it (the user would only rely on -save-temps=all to control this). Change-Id: I0c00486f95eb1d4e296b5247c488407c47f0b2d9 [ROCm/clr commit: 8ab3fd58cf392e878075e8f281812268e5fd54ec] --- projects/clr/rocclr/device/devprogram.cpp | 8 ++++---- projects/clr/rocclr/device/devprogram.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/clr/rocclr/device/devprogram.cpp b/projects/clr/rocclr/device/devprogram.cpp index b8ca220cfc..5455d80cd9 100644 --- a/projects/clr/rocclr/device/devprogram.cpp +++ b/projects/clr/rocclr/device/devprogram.cpp @@ -344,7 +344,7 @@ amd_comgr_status_t Program::createAction(const amd_comgr_language_t oclver, } bool Program::linkLLVMBitcode(const amd_comgr_data_set_t inputs, - const std::vector& options, const bool requiredDump, + const std::vector& options, amd::option::Options* amdOptions, amd_comgr_data_set_t* output, char* binaryData[], size_t* binarySize, const bool link_dev_libs) { @@ -385,7 +385,7 @@ bool Program::linkLLVMBitcode(const amd_comgr_data_set_t inputs, if (status == AMD_COMGR_STATUS_SUCCESS) { std::string dumpFileName; - if (requiredDump && amdOptions->isDumpFlagSet(amd::option::DUMP_BC_LINKED)) { + if (amdOptions->isDumpFlagSet(amd::option::DUMP_BC_LINKED)) { dumpFileName = amdOptions->getDumpFileName("_linked.bc"); } status = extractByteCodeBinary(*output, AMD_COMGR_DATA_KIND_BC, dumpFileName, binaryData, @@ -971,7 +971,7 @@ bool Program::linkImplLC(const std::vector& inputPrograms, size_t binarySize = 0; std::vector linkOptions; constexpr bool kLinkDevLibs = false; - bool ret = linkLLVMBitcode(inputs, linkOptions, false, options, &output, &binaryData, + bool ret = linkLLVMBitcode(inputs, linkOptions, options, &output, &binaryData, &binarySize, kLinkDevLibs); amd::Comgr::destroy_data_set(output); @@ -1222,7 +1222,7 @@ bool Program::linkImplLC(amd::option::Options* options) { bool ret = (status == AMD_COMGR_STATUS_SUCCESS); if (ret) { hasLinkedBC = true; - ret = linkLLVMBitcode(inputs, linkOptions, true, options, &linked_bc); + ret = linkLLVMBitcode(inputs, linkOptions, options, &linked_bc); } amd::Comgr::destroy_data_set(inputs); diff --git a/projects/clr/rocclr/device/devprogram.hpp b/projects/clr/rocclr/device/devprogram.hpp index 741d81b026..3bf0679a5c 100644 --- a/projects/clr/rocclr/device/devprogram.hpp +++ b/projects/clr/rocclr/device/devprogram.hpp @@ -454,7 +454,7 @@ class Program : public amd::HeapObject { //! Create the bitcode of the linked input dataset bool linkLLVMBitcode(const amd_comgr_data_set_t inputs, - const std::vector& options, const bool requiredDump, + const std::vector& options, amd::option::Options* amdOptions, amd_comgr_data_set_t* output, char* binaryData[] = nullptr, size_t* binarySize = nullptr, const bool link_dev_libs = true);