P4 to Git Change 1205056 by gandryey@gera-w8 on 2015/10/28 17:13:54

SWDEV-78467 - OpenCL LiquidFlash feature
	- Add WriteBufferFromFile command

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#189 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#259 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#333 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#72 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.hpp#79 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.hpp#93 edit
... //depot/stg/opencl/drivers/opencl/runtime/runtimedefs#35 edit


[ROCm/clr commit: 715cbfd662]

projects/clr/rocclr/runtime/device/device.hpp

@@ -58,6 +58,7 @@ class SvmCopyMemoryCommand;
 class SvmFillMemoryCommand;
 class SvmMapMemoryCommand;
 class SvmUnmapMemoryCommand;
+class WriteBufferFromFileCommand;
 class HwDebugManager;
 class Device;
 struct KernelParameterDescriptor;
@@ -111,6 +112,7 @@ enum OclExtensions {
     ClKhrMipMapImage,
     ClKhrMipMapImageWrites,
     ClKhrIlProgram,
+    ClAMDLiquidFlash,
     ClExtTotal
 };
 
@@ -153,6 +155,7 @@ OclExtensionsString[] = {
     "cl_khr_mipmap_image ",
     "cl_khr_mipmap_image_writes ",
     "",
+    (IS_MAINLINE || IS_LINUX) ? "" : "cl_amd_liquid_flash ",
     NULL
 };
 
@@ -1410,13 +1413,14 @@ public:
     virtual void submitThreadTraceMemObjects(amd::ThreadTraceMemObjectsCommand& cmd) = 0;
     virtual void submitThreadTrace(amd::ThreadTraceCommand& cmd) = 0;
     virtual void flush(amd::Command* list = NULL, bool wait = false) = 0;
-    virtual void submitSignal(amd::SignalCommand & cmd) = 0;
-    virtual void submitMakeBuffersResident(amd::MakeBuffersResidentCommand & cmd) = 0;
     virtual void submitSvmFreeMemory(amd::SvmFreeMemoryCommand& cmd) = 0;
     virtual void submitSvmCopyMemory(amd::SvmCopyMemoryCommand& cmd) = 0;
     virtual void submitSvmFillMemory(amd::SvmFillMemoryCommand& cmd) = 0;
     virtual void submitSvmMapMemory(amd::SvmMapMemoryCommand& cmd) = 0;
     virtual void submitSvmUnmapMemory(amd::SvmUnmapMemoryCommand& cmd) = 0;
+    /// Optional extensions
+    virtual void submitSignal(amd::SignalCommand & cmd) = 0;
+    virtual void submitMakeBuffersResident(amd::MakeBuffersResidentCommand & cmd) = 0;
 
     //! Get the blit manager object
     device::BlitManager& blitMgr() const { return *blitMgr_; }

projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp

@@ -337,6 +337,10 @@ Settings::create(
     enableExtension(ClAmdVec3);
     enableExtension(ClAmdPrintf);
     enableExtension(ClExtAtomicCounters32);
+    // Enable some platform extensions
+    enableExtension(ClAmdDeviceAttributeQuery);
+    enableExtension(ClKhrSpir);
+    enableExtension(ClAMDLiquidFlash);
 
     hwLDSSize_      = 32 * Ki;
 
@@ -380,11 +384,6 @@ Settings::create(
 
     svmAtomics_ = (calAttr.svmAtomics || calAttr.isSVMFineGrainSystem) ? true : false;
 
-    // Enable some platform extensions
-    enableExtension(ClAmdDeviceAttributeQuery);
-
-    enableExtension(ClKhrSpir);
-
     // SVM is not currently supported for DX Interop
     if (!svmFineGrainSystem_) {
 #if defined(_WIN32)