P4 to Git Change 1826839 by slinder1@slinder1-fiji-ocllc on 2019/06/13 19:19:49

SWDEV-187290 - Update to new Comgr option handling

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#46 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#94 edit
This commit is contained in:
foreman
2019-06-14 07:15:00 -04:00
parent 66c58e32c8
commit 21632e20a0
5 changed files with 128 additions and 74 deletions
+9 -5
View File
@@ -279,7 +279,11 @@ class Program : public amd::HeapObject {
amd::option::Options* options, void* binary, size_t binSize) { return true; }
//! Returns all the options to be appended while passing to the compiler library
std::string ProcessOptions(amd::option::Options* options);
std::vector<std::string> ProcessOptions(amd::option::Options* options);
//! Returns all the options to be appended while passing to the compiler library,
//! flattened into one string.
std::string ProcessOptionsFlattened(amd::option::Options* options);
//! At linking time, get the set of compile options to be used from
//! the set of input program, warn if they have inconsisten compile options.
@@ -354,23 +358,23 @@ class Program : public amd::HeapObject {
//! Create action for the specified language, target and options
amd_comgr_status_t createAction(const amd_comgr_language_t oclvar,
const std::string& targetIdent, const std::string& options,
const std::string& targetIdent, const std::vector<std::string>& options,
amd_comgr_action_info_t* action, bool* hasAction);
//! Create the bitcode of the linked input dataset
bool linkLLVMBitcode(const amd_comgr_data_set_t inputs,
const std::string& options, const bool requiredDump,
const std::vector<std::string>& options, const bool requiredDump,
amd::option::Options* amdOptions, amd_comgr_data_set_t* output,
char* binary[] = nullptr, size_t* binarySize = nullptr);
//! Create the bitcode of the compiled input dataset
bool compileToLLVMBitcode(const amd_comgr_data_set_t inputs,
const std::string& options, amd::option::Options* amdOptions,
const std::vector<std::string>& options, amd::option::Options* amdOptions,
char* binary[], size_t* binarySize);
//! Compile and create the excutable of the input dataset
bool compileAndLinkExecutable(const amd_comgr_data_set_t inputs,
const std::string& options, amd::option::Options* amdOptions,
const std::vector<std::string>& options, amd::option::Options* amdOptions,
char* executable[], size_t* executableSize);
//! Create the map for the kernel name and its metadata for fast access