From cdf6767f9e032070151820b58b0f9fa69a6718a8 Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Mon, 30 Sep 2019 13:48:51 -0400
Subject: [PATCH] P4 to Git Change 2006451 by gandryey@gera-win10 on 2019/09/30
 13:39:35

	SWDEV-79445 - OCL generic changes and code clean-up
	- Add a missing file from CL#2006447

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palgpuopen.hpp#10 edit


[ROCm/clr commit: 0ced6b211b70d71649ac696102b3875d84f95c1a]
---
 .../rocclr/runtime/device/pal/palgpuopen.hpp  | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/projects/clr/rocclr/runtime/device/pal/palgpuopen.hpp b/projects/clr/rocclr/runtime/device/pal/palgpuopen.hpp
index af56f6efd3..aea1ee6d55 100644
--- a/projects/clr/rocclr/runtime/device/pal/palgpuopen.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/palgpuopen.hpp
@@ -30,6 +30,25 @@
 #include "palQueue.h"
 #include "palUtil.h"
 
+namespace pal {
+class Settings;
+class Device;
+class VirtualGPU;
+class HSAILKernel;
+
+// ================================================================================================
+enum class RgpSqqtBarrierReason : uint32_t {
+  Invalid = 0,
+  MemDependency = 0xC0000000,
+  ProfilingControl = 0xC0000001,
+  SignalSubmit = 0xC0000002,
+  PostDeviceEnqueue = 0xC0000003,
+  Unknown = 0xffffffff
+};
+
+}
+
+#ifdef PAL_GPUOPEN_OCL
 // gpuopen headers
 #include "gpuopen.h"
 
@@ -64,11 +83,6 @@ class HandlerServer;
 }  // namespace DevDriver
 
 namespace pal {
-class Settings;
-class Device;
-class VirtualGPU;
-class HSAILKernel;
-
 // ================================================================================================
 // RgpSqttMarkerIdentifier - Identifiers for RGP SQ thread-tracing markers (Table 1)
 enum RgpSqttMarkerIdentifier : uint32_t {
@@ -105,16 +119,6 @@ enum class RgpSqttMarkerEventType : uint32_t {
   Invalid = 0xffffffff
 };
 
-// ================================================================================================
-enum class RgpSqqtBarrierReason : uint32_t {
-  Invalid = 0,
-  MemDependency = 0xC0000000,
-  ProfilingControl = 0xC0000001,
-  SignalSubmit = 0xC0000002,
-  PostDeviceEnqueue = 0xC0000003,
-  Unknown = 0xffffffff
-};
-
 // ================================================================================================
 // RgpSqttMarkerEvent - "Event (Per-draw/dispatch)" RGP SQ thread-tracing marker.
 // These are generated ahead of draws or dispatches for commands that trigger generation of waves
@@ -377,4 +381,18 @@ inline bool RgpCaptureMgr::IsQueueTimingActive() const {
           (trace_.status_ == TraceStatus::Running || trace_.status_ == TraceStatus::Preparing ||
            trace_.status_ == TraceStatus::WaitingForSqtt));
 }
-};  // namespace pal
+}  // namespace pal
+#else // PAL_GPUOPEN_OCL
+namespace pal {
+class RgpCaptureMgr {
+ public:
+  static RgpCaptureMgr* Create(Pal::IPlatform* platform, const Device& device) { return nullptr; }
+  Pal::Result TimedQueueSubmit(Pal::IQueue* queue, uint64_t cmdId,
+                               const Pal::SubmitInfo& submitInfo) const {}
+  void PreDispatch(VirtualGPU* gpu, const HSAILKernel& kernel, size_t x, size_t y, size_t z) {}
+  void PostDispatch(VirtualGPU* gpu) {}
+  void FinishRGPTrace(VirtualGPU* gpu, bool aborted) {}
+  bool RegisterTimedQueue(uint32_t queue_id, Pal::IQueue* iQueue, bool* debug_vmid) const { return true; }
+};
+}  // namespace pal
+#endif // PAL_GPUOPEN_OCL
\ No newline at end of file