P4 to Git Change 1196935 by jatang@jatang-ocl-lnx1 on 2015/10/05 14:37:02

SWDEV-77321 - Runtime to replace metadata LimitWave with WavePerSimdHint.

	Compiler has changed LimitWave to WavePerSimdHint, so runtime need to make corresponding change to have the Wave Limiter continue working.

	WavePerSimdHint=1,...,10 will be dealt with later.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#258 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#300 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#119 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.cpp#8 edit


[ROCm/clr commit: d4d9167613]

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

@@ -344,8 +344,21 @@ void WaveLimiterManager::enable() {
     auto hwInfo = gpuDev->hwInfo();
     // Enable it only for CI+, unless GPU_WAVE_LIMIT_ENABLE is set to 1
     // Disabled for SI due to bug #10817
-    setIfNotDefault(enable_, GPU_WAVE_LIMIT_ENABLE,
-         owner_->workGroupInfo()->limitWave_ && gpuDev->settings().ciPlus_);
+
+    if (!flagIsDefault(GPU_WAVE_LIMIT_ENABLE)) {
+        enable_ = GPU_WAVE_LIMIT_ENABLE;
+    }
+    else {
+        if (gpuDev->settings().ciPlus_) {
+            if (owner_->workGroupInfo()->wavesPerSimdHint_ == 0) {
+                enable_ = true;
+            }
+            else if (owner_->workGroupInfo()->wavesPerSimdHint_ <= GPU_WAVE_LIMIT_MAX_WAVE) {
+                //Todo:
+                //fixed_ = owner_->workGroupInfo()->wavesPerSimdHint_;
+            }
+        }
+    }
 }
 
 }