From 4510caed265c0d5055c560c79eb3c32cf6f359c1 Mon Sep 17 00:00:00 2001
From: Saleel Kudchadker <Saleel.Kudchadker@amd.com>
Date: Fri, 16 Jun 2023 15:09:43 -0700
Subject: [PATCH] SWDEV-384557 - Include query under env var

Change-Id: Ibe0335168f9ad0cb72abb2ed69a5e40d33ce7c1c
---
 rocclr/device/rocm/rocdevice.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/rocclr/device/rocm/rocdevice.cpp b/rocclr/device/rocm/rocdevice.cpp
index 562732b5ee..e05ccf4898 100644
--- a/rocclr/device/rocm/rocdevice.cpp
+++ b/rocclr/device/rocm/rocdevice.cpp
@@ -1248,19 +1248,21 @@ bool Device::populateOCLDeviceConstants() {
   }
   assert(group_segment_size > 0);
 
-  // Find SDMA read mask
-  if (HSA_STATUS_SUCCESS != hsa_amd_memory_copy_engine_status(getCpuAgent(), getBackendDevice(),
-                                                              &maxSdmaReadMask_)) {
-    return false;
-  }
-  assert(maxSdmaReadMask_ > 0 && "No SDMA engines available for Read");
+  if (HIP_USE_SDMA_QUERY) {
+    // Find SDMA read mask
+    if (HSA_STATUS_SUCCESS != hsa_amd_memory_copy_engine_status(getCpuAgent(), getBackendDevice(),
+                                                                &maxSdmaReadMask_)) {
+      return false;
+    }
+    assert(maxSdmaReadMask_ > 0 && "No SDMA engines available for Read");
 
-  // Find SDMA write mask
-  if (HSA_STATUS_SUCCESS != hsa_amd_memory_copy_engine_status(getBackendDevice(), getCpuAgent(),
-                                                              &maxSdmaWriteMask_)) {
-    return false;
+    // Find SDMA write mask
+    if (HSA_STATUS_SUCCESS != hsa_amd_memory_copy_engine_status(getBackendDevice(), getCpuAgent(),
+                                                                &maxSdmaWriteMask_)) {
+      return false;
+    }
+    assert(maxSdmaWriteMask_ > 0 && "No SDMA engines available for Write");
   }
-  assert(maxSdmaWriteMask_ > 0 && "No SDMA engines available for Write");
 
   info_.localMemSizePerCU_ = group_segment_size;
   info_.localMemSize_ = group_segment_size;