P4 to Git Change 1507590 by gandryey@gera-w8 on 2018/01/24 18:30:51

SWDEV-142271 - Performance drop is observed in Ocean Surface Simulation of Compubenchcl in 17.50 when compared to 17.Q4.1
	- Fix compilation errors in Linux.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palwavelimiter.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palwavelimiter.hpp#6 edit


[ROCm/clr commit: 0558a4abb6]

projects/clr/rocclr/runtime/device/pal/palwavelimiter.cpp

@@ -13,7 +13,7 @@ namespace pal {
 
 uint WaveLimiter::MaxWave;
 uint WaveLimiter::RunCount;
-uint WLAlgorithmSmooth::AdaptCount;
+uint WaveLimiter::AdaptCount;
 
 WaveLimiter::WaveLimiter(WaveLimiterManager* manager, uint seqNum, bool enable, bool enableDump)
     : manager_(manager), dumper_(manager_->name() + "_" + std::to_string(seqNum), enableDump) {
@@ -45,9 +45,9 @@ uint WaveLimiter::getWavesPerSH() {
   // Generate different wave counts in the adaptation mode
   if ((state_ == ADAPT) && (sampleCount_ < AdaptCount)) {
     if (numContinuousSamples_ == 0) {
-        waves_ = ++waves_ % (MaxWave + 1);
+        waves_ = (++waves_) % (MaxWave + 1);
     }
-    numContinuousSamples_ = ++numContinuousSamples_ % MaxContinuousSamples;
+    numContinuousSamples_ = (++numContinuousSamples_) % MaxContinuousSamples;
     ++sampleCount_;
   }
   else {

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

@@ -63,8 +63,8 @@ class WaveLimiter : public amd::ProfilingCallback {
 
   static uint MaxWave;      // Maximum number of waves per SIMD
   static uint RunCount;     // Number of kernel executions for normal run
-  const static uint MaxContinuousSamples = 8;
   static uint AdaptCount;   // Number of kernel executions for adapting
+  const static uint MaxContinuousSamples = 8;
 
   //! Call back from Event::recordProfilingInfo to get execution time.
   virtual void callback(ulong duration, uint32_t waves) = 0;