From 74f9ba24e0b4bef163f27edda73e2bf8054490f4 Mon Sep 17 00:00:00 2001
From: Graham Sider <Graham.Sider@amd.com>
Date: Thu, 1 Jun 2023 12:00:23 -0400
Subject: [PATCH] rocrtst: Remove extra clear_code_object() calls

A patch was made in gfx940 npi branch to move the kernel object file
loading to outside the rocrtstNeg.Queue_Validation_* main queue creation
and submission loops, and added a clear_code_object() after the loop.

Another patch was made to the non-npi branch which adds a
clear_code_object() inside the loop. When the npi branch patch was
merged, this was causing the code object to be cleared at the end of
the first loop. Remove these clear_code_object() calls.

Signed-off-by: Graham Sider <Graham.Sider@amd.com>
Change-Id: Id4188e78411e81c5071bf715c1f02491f571ab79


[ROCm/ROCR-Runtime commit: dbe2a82e350866392c498c353af508963f9c5544]
---
 .../rocr-runtime/rocrtst/suites/negative/queue_validation.cc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc b/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc
index d03a9b4a4c..16b08e1b7e 100755
--- a/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc
+++ b/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc
@@ -240,7 +240,6 @@ void QueueValidation::QueueValidationForInvalidDimension(hsa_agent_t cpuAgent,
     ASSERT_EQ(completion, 1);
 
     hsa_signal_store_relaxed(aql().completion_signal, 1);
-    clear_code_object();
   }
   sleep(1);
   for (ii = 0; ii < kMaxQueue; ++ii) {
@@ -328,7 +327,6 @@ void QueueValidation::QueueValidationInvalidGroupMemory(hsa_agent_t cpuAgent,
     ASSERT_EQ(completion, 1);
 
     hsa_signal_store_relaxed(aql().completion_signal, 1);
-    clear_code_object();
   }
   sleep(1);
   for (ii = 0; ii < kMaxQueue; ++ii) {
@@ -414,7 +412,6 @@ void QueueValidation::QueueValidationForInvalidKernelObject(hsa_agent_t cpuAgent
     ASSERT_EQ(completion, 1);
 
     hsa_signal_store_relaxed(aql().completion_signal, 1);
-    clear_code_object();
   }
   sleep(1);
   for (ii = 0; ii < kMaxQueue; ++ii) {
@@ -494,7 +491,6 @@ void QueueValidation::QueueValidationForInvalidPacket(hsa_agent_t cpuAgent,
     ASSERT_EQ(completion, 1);
 
     hsa_signal_store_relaxed(aql().completion_signal, 1);
-    clear_code_object();
   }
   sleep(1);
   for (ii = 0; ii < kMaxQueue; ++ii) {
@@ -585,7 +581,6 @@ void QueueValidation::QueueValidationForInvalidWorkGroupSize(hsa_agent_t cpuAgen
 
       hsa_signal_store_relaxed(aql().completion_signal, 1);
       if (queue[ii]) { hsa_queue_destroy(queue[ii]); }
-      clear_code_object();
     }
   }
   sleep(1);