AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1559096 by gandryey@gera-w8 on 2018/05/24 10:34:47

Browse Source 
SWDEV-79445 - OCL generic changes and code clean-up
	- Remove obsolete logic for aliased kernels, since it was a pre-SI optimization

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#418 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#98 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#52 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#93 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.hpp#44 edit
This commit is contained in:
foreman
2018-05-24 10:45:00 -04:00
parent a245f46203
commit bcea58f07f
7 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/platform/kernel.cpp
+2 -2
View File
@@ -29,8 +29,8 @@ Kernel::~Kernel() {
delete parameters_;
}
const device::Kernel* Kernel::getDeviceKernel(const Device& device, bool noAlias) const {
return symbol_.getDeviceKernel(device, noAlias);
const device::Kernel* Kernel::getDeviceKernel(const Device& device) const {
return symbol_.getDeviceKernel(device);
}
const KernelSignature& Kernel::signature() const { return symbol_.signature(); }
rocclr/runtime/platform/kernel.hpp
+1 -2
View File
@@ -273,8 +273,7 @@ class Kernel : public RuntimeObject {
const KernelSignature& signature() const;
//! Return the kernel entry point for the given device.
const device::Kernel* getDeviceKernel(const Device& device, //!< Device object
bool noAlias = true //!< Controls alias optimization
const device::Kernel* getDeviceKernel(const Device& device //!< Device object
) const;
//! Return the parameters.
rocclr/runtime/platform/program.cpp
+4 -9
View File
@@ -603,22 +603,17 @@ bool Program::ParseAllOptions(const std::string& options, option::Options& parse
return amd::option::parseAllOptions(allOpts, parsedOptions, linkOptsOnly);
}
bool Symbol::setDeviceKernel(const Device& device, const device::Kernel* func, bool noAlias) {
bool Symbol::setDeviceKernel(const Device& device, const device::Kernel* func) {
// FIXME_lmoriche: check that the signatures are compatible
if (deviceKernels_.size() == 0) {
signature_ = func->signature();
}
if (noAlias) {
deviceKernels_[&device] = func;
} else {
devKernelsNoOpt_[&device] = func;
}
deviceKernels_[&device] = func;
return true;
}
const device::Kernel* Symbol::getDeviceKernel(const Device& device, bool noAlias) const {
const devicekernels_t* devKernels = (noAlias) ? &deviceKernels_ : &devKernelsNoOpt_;
const device::Kernel* Symbol::getDeviceKernel(const Device& device) const {
const devicekernels_t* devKernels = &deviceKernels_;
const auto itEnd = devKernels->cend();
auto it = devKernels->find(&device);
if (it != itEnd) {
rocclr/runtime/platform/program.hpp
+2 -5
View File
@@ -39,7 +39,6 @@ class Symbol : public HeapObject {
private:
devicekernels_t deviceKernels_; //! All device kernels objects.
devicekernels_t devKernelsNoOpt_; //! Kernel objects without optimization
KernelSignature signature_; //! Kernel signature.
public:
@@ -48,13 +47,11 @@ class Symbol : public HeapObject {
//! Set the entry point and check or set the signature.
bool setDeviceKernel(const Device& device, //!< Device object.
const device::Kernel* func, //!< Device kernel object.
bool noAlias = true //!< No-alias optimization
const device::Kernel* func //!< Device kernel object.
);
//! Return the device kernel.
const device::Kernel* getDeviceKernel(const Device& device, //!< Device object.
bool noAlias = true //!< No-alias optimization
const device::Kernel* getDeviceKernel(const Device& device //!< Device object.
) const;
//! Return this Symbol's signature.