P4 to Git Change 1288091 by jsjodin@jsjodin-git2p4-llvm on 2016/07/06 18:00:18

SWDEV-3 - [Hexagon] Revert r274381: that was actually wrong

	git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274384 91177308-0d34-0410-b5e6-96231b3b80d8

	GitHash: 364f2492a3d31efedfec3127f78b0aa6c171bc4b

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/llvm.git/lib/Target/Hexagon/HexagonExpandCondsets.cpp#6 edit

rocclr/runtime/device/pal/palresource.cpp

@@ -1072,10 +1072,9 @@ Resource::free()
 void
 Resource::writeRawData(
     VirtualGPU& gpu,
-    size_t      offset,
-    size_t      size,
+    size_t size,
     const void* data,
-    bool        waitForEvent) const
+    bool waitForEvent) const
 {
     GpuEvent    event;
 
@@ -1083,8 +1082,11 @@ Resource::writeRawData(
     // size needs to be DWORD aligned
     assert((size & 3) == 0);
     gpu.eventBegin(MainEngine);
+    //! @todo Remove cache flush
+    //! It's a workaround for a PAL crash with embedded data, allocated before any command
+    gpu.flushCUCaches();
     gpu.queue(MainEngine).addCmdMemRef(iMem());
-    gpu.iCmd()->CmdUpdateMemory(*iMem(), offset, size, reinterpret_cast<const uint32_t*>(data));
+    gpu.iCmd()->CmdUpdateMemory(*iMem(), 0, size, reinterpret_cast<const uint32_t*>(data));
     gpu.eventEnd(MainEngine, event);
 
     setBusy(gpu, event);
@@ -1936,7 +1938,7 @@ Resource::warmUpRenames(VirtualGPU& gpu)
         uint    dummy = 0;
         const bool NoWait = false;
         // Write 0 for the buffer paging by VidMM
-        writeRawData(gpu, 0, sizeof(dummy), &dummy, NoWait);
+        writeRawData(gpu, sizeof(dummy), &dummy, NoWait);
         const bool Force = true;
         rename(gpu, Force);
     }