P4 to Git Change 1281192 by jatang@jatang-opencl-hsa-stg2 on 2016/06/17 15:19:04

SWDEV-1 - Back out changelist 1281189.

	Made a mistake. Was trying to shelve the CL.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/computeCmdBuffer.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/computeCmdBuffer.h#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ComputeCmdBuffer.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ComputeCmdBuffer.h#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PerfCounter.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PerfTrace.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.hpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#13 edit

rocclr/runtime/device/pal/palvirtual.cpp

@@ -2303,12 +2303,6 @@ VirtualGPU::submitPerfCounter(amd::PerfCounterCommand& vcmd)
 
     // Create performance experiment
     Pal::PerfExperimentCreateInfo   createInfo = {};
-
-    createInfo.optionFlags.sampleInternalOperations       = 1;
-    createInfo.optionFlags.cacheFlushOnCounterCollection  = 1;
-    createInfo.optionFlags.sqShaderMask  = 1;
-    createInfo.optionValues.sampleInternalOperations      = true;
-    createInfo.optionValues.cacheFlushOnCounterCollection = true;
     createInfo.optionValues.sqShaderMask = Pal::PerfShaderMaskCs;
 
     PalCounterReference* palRef = PalCounterReference::Create(*this, createInfo);