P4 to Git Change 1608319 by gandryey@gera-lnx-rcf-lc on 2018/09/19 16:55:11
SWDEV-79445 - OCL generic changes and code clean-up Program compilation clean-up. Step#2: - Combine PAL and ROCr implementations of compilation under common methods in device::Program for HSAIL and LC. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#319 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#2 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#74 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcompiler.cpp#26 delete ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#34 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#73 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#30 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#46 delete ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#31 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#87 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#36 edit
This commit is contained in:
@@ -101,12 +101,6 @@ class HSAILProgram : public roc::Program {
|
||||
virtual ~HSAILProgram();
|
||||
|
||||
protected:
|
||||
virtual bool compileImpl(const std::string& sourceCode, //!< the program's source code
|
||||
const std::vector<const std::string*>& headers,
|
||||
const char** headerIncludeNames,
|
||||
amd::option::Options* options //!< compile options's object
|
||||
) final;
|
||||
|
||||
virtual bool linkImpl(amd::option::Options* options) final;
|
||||
|
||||
virtual bool linkImpl(const std::vector<device::Program*>& inputPrograms,
|
||||
@@ -134,12 +128,6 @@ public:
|
||||
const CodeObjectMD* metadata() const { return metadata_; }
|
||||
|
||||
protected:
|
||||
virtual bool compileImpl(const std::string& sourceCode, //!< the program's source code
|
||||
const std::vector<const std::string*>& headers,
|
||||
const char** headerIncludeNames,
|
||||
amd::option::Options* options //!< compile options's object
|
||||
) final;
|
||||
|
||||
virtual bool linkImpl(amd::option::Options* options) final;
|
||||
|
||||
virtual bool linkImpl(const std::vector<device::Program*>& inputPrograms,
|
||||
@@ -147,6 +135,8 @@ protected:
|
||||
|
||||
virtual bool createBinary(amd::option::Options* options) final;
|
||||
|
||||
bool saveBinaryAndSetType(type_t type) { return true; }
|
||||
|
||||
private:
|
||||
bool saveBinaryAndSetType(type_t type, void* rawBinary, size_t size);
|
||||
|
||||
@@ -156,8 +146,6 @@ private:
|
||||
bool setKernels(amd::option::Options* options, void* binary, size_t binSize);
|
||||
|
||||
CodeObjectMD* metadata_; //!< Runtime metadata
|
||||
//! Return a new transient compiler instance.
|
||||
static amd::opencl_driver::Compiler* newCompilerInstance();
|
||||
};
|
||||
#endif // defined(WITH_LIGHTNING_COMPILER)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user