From 358c091a1301d36d034f1776afcadf5607d15ebb Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Fri, 17 Apr 2020 20:43:07 -0500 Subject: [PATCH] Remove references to finalizer header. Change-Id: I6608c95268ab4bc66053d889cf7d5a30cd8fccab [ROCm/ROCR-Runtime commit: e25ae1263b58e84558b37fb9277aadbf28ccce8a] --- projects/rocr-runtime/rocrtst/common/common.h | 1 - .../rocr-runtime/rocrtst/suites/functional/aql_barrier_bit.cc | 1 - .../rocr-runtime/rocrtst/suites/functional/concurrent_init.cc | 1 - .../rocrtst/suites/functional/concurrent_init_shutdown.cc | 1 - .../rocrtst/suites/functional/concurrent_shutdown.cc | 1 - projects/rocr-runtime/rocrtst/suites/functional/debug_basic.cc | 1 - projects/rocr-runtime/rocrtst/suites/functional/ipc.cc | 1 - projects/rocr-runtime/rocrtst/suites/functional/memory_access.cc | 1 - .../rocr-runtime/rocrtst/suites/functional/memory_alignment.cc | 1 - .../rocr-runtime/rocrtst/suites/functional/memory_allocation.cc | 1 - .../rocr-runtime/rocrtst/suites/functional/memory_atomics.cc | 1 - projects/rocr-runtime/rocrtst/suites/functional/memory_basic.cc | 1 - .../rocr-runtime/rocrtst/suites/functional/reference_count.cc | 1 - .../rocr-runtime/rocrtst/suites/functional/signal_concurrent.cc | 1 - projects/rocr-runtime/rocrtst/suites/functional/signal_kernel.cc | 1 - .../rocrtst/suites/negative/memory_allocate_negative_tests.cc | 1 - .../rocr-runtime/rocrtst/suites/negative/queue_validation.cc | 1 - .../rocr-runtime/rocrtst/suites/performance/dispatch_time.cc | 1 - .../rocr-runtime/rocrtst/suites/performance/enqueueLatency.cc | 1 - .../rocrtst/suites/stress/memory_concurrent_tests.cc | 1 - .../rocrtst/suites/stress/queue_write_index_concurrent_tests.cc | 1 - .../rocrtst/suites/test_common/test_case_template.cc | 1 - 22 files changed, 22 deletions(-) diff --git a/projects/rocr-runtime/rocrtst/common/common.h b/projects/rocr-runtime/rocrtst/common/common.h index b2f8f8d563..503166ae02 100755 --- a/projects/rocr-runtime/rocrtst/common/common.h +++ b/projects/rocr-runtime/rocrtst/common/common.h @@ -59,7 +59,6 @@ #include "hsa/hsa.h" #include "hsa/hsa_ext_amd.h" -#include "hsa/hsa_ext_finalize.h" namespace rocrtst { diff --git a/projects/rocr-runtime/rocrtst/suites/functional/aql_barrier_bit.cc b/projects/rocr-runtime/rocrtst/suites/functional/aql_barrier_bit.cc index bd4287c6ef..5d28445427 100644 --- a/projects/rocr-runtime/rocrtst/suites/functional/aql_barrier_bit.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/aql_barrier_bit.cc @@ -54,7 +54,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const int NUM_WAIT_KERNELS = 8; diff --git a/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init.cc b/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init.cc index d9e5b59abd..a0758ab049 100644 --- a/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init.cc @@ -54,7 +54,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static void* TestHSAInitFunction(void* args) { // This function called for each thread diff --git a/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init_shutdown.cc b/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init_shutdown.cc index a24937d24e..290e37cffa 100644 --- a/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init_shutdown.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/concurrent_init_shutdown.cc @@ -52,7 +52,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static void* TestHSAInitShutdownFunction(void* args) { // This is callback function for each thread diff --git a/projects/rocr-runtime/rocrtst/suites/functional/concurrent_shutdown.cc b/projects/rocr-runtime/rocrtst/suites/functional/concurrent_shutdown.cc index 646ac4d6e8..785d585db7 100644 --- a/projects/rocr-runtime/rocrtst/suites/functional/concurrent_shutdown.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/concurrent_shutdown.cc @@ -54,7 +54,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" void* TestHSAShutdownFunction(void* args) { // This function called for each thread diff --git a/projects/rocr-runtime/rocrtst/suites/functional/debug_basic.cc b/projects/rocr-runtime/rocrtst/suites/functional/debug_basic.cc index 13474022d3..f1a1f4095d 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/debug_basic.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/debug_basic.cc @@ -56,7 +56,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" #define M_ORDER 64 #define M_GET(M, I, J) M[I * M_ORDER + J] diff --git a/projects/rocr-runtime/rocrtst/suites/functional/ipc.cc b/projects/rocr-runtime/rocrtst/suites/functional/ipc.cc index c88bcfe886..d3b00a146d 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/ipc.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/ipc.cc @@ -110,7 +110,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kNumBufferElements = 256; diff --git a/projects/rocr-runtime/rocrtst/suites/functional/memory_access.cc b/projects/rocr-runtime/rocrtst/suites/functional/memory_access.cc index 69869d9543..9f50e10897 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/memory_access.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/memory_access.cc @@ -57,7 +57,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" #define RET_IF_HSA_ERR(err) { \ diff --git a/projects/rocr-runtime/rocrtst/suites/functional/memory_alignment.cc b/projects/rocr-runtime/rocrtst/suites/functional/memory_alignment.cc index d52342aa5c..063f2b0198 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/memory_alignment.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/memory_alignment.cc @@ -58,7 +58,6 @@ #include "common/concurrent_utils.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kNumThreads = 4096; diff --git a/projects/rocr-runtime/rocrtst/suites/functional/memory_allocation.cc b/projects/rocr-runtime/rocrtst/suites/functional/memory_allocation.cc index 1d98942075..7a47ec6925 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/memory_allocation.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/memory_allocation.cc @@ -58,7 +58,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kNumBufferElements = 256; static const int kValue = 5; diff --git a/projects/rocr-runtime/rocrtst/suites/functional/memory_atomics.cc b/projects/rocr-runtime/rocrtst/suites/functional/memory_atomics.cc index 25e1745fb0..95390e6e90 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/memory_atomics.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/memory_atomics.cc @@ -58,7 +58,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kNumBufferElements = 256; static const int kValue = 5; diff --git a/projects/rocr-runtime/rocrtst/suites/functional/memory_basic.cc b/projects/rocr-runtime/rocrtst/suites/functional/memory_basic.cc index e862040576..25ef328153 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/memory_basic.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/memory_basic.cc @@ -55,7 +55,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kNumBufferElements = 256; diff --git a/projects/rocr-runtime/rocrtst/suites/functional/reference_count.cc b/projects/rocr-runtime/rocrtst/suites/functional/reference_count.cc index db3ab24526..375a31df97 100644 --- a/projects/rocr-runtime/rocrtst/suites/functional/reference_count.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/reference_count.cc @@ -70,7 +70,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const int NumOfTimes = 1000; // No of times the hsa runtime will be initialized static const double MaxRefCount = 2147483649; // Setting to max value to test to INIT_MAX+2 as defined in hsa runtime diff --git a/projects/rocr-runtime/rocrtst/suites/functional/signal_concurrent.cc b/projects/rocr-runtime/rocrtst/suites/functional/signal_concurrent.cc index f50685c5dd..68dfe7148d 100644 --- a/projects/rocr-runtime/rocrtst/suites/functional/signal_concurrent.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/signal_concurrent.cc @@ -54,7 +54,6 @@ #include "common/concurrent_utils.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const int N = 8; static const int M = 32; diff --git a/projects/rocr-runtime/rocrtst/suites/functional/signal_kernel.cc b/projects/rocr-runtime/rocrtst/suites/functional/signal_kernel.cc index bbf991be03..3f27a1e96c 100755 --- a/projects/rocr-runtime/rocrtst/suites/functional/signal_kernel.cc +++ b/projects/rocr-runtime/rocrtst/suites/functional/signal_kernel.cc @@ -56,7 +56,6 @@ #include "common/concurrent_utils.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static unsigned int NumOfKernels = 1; diff --git a/projects/rocr-runtime/rocrtst/suites/negative/memory_allocate_negative_tests.cc b/projects/rocr-runtime/rocrtst/suites/negative/memory_allocate_negative_tests.cc index 8378ede9c9..e738140bcc 100755 --- a/projects/rocr-runtime/rocrtst/suites/negative/memory_allocate_negative_tests.cc +++ b/projects/rocr-runtime/rocrtst/suites/negative/memory_allocate_negative_tests.cc @@ -57,7 +57,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kNumBufferElements = 256; diff --git a/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc b/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc index 24e96f18e7..528194d638 100755 --- a/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc +++ b/projects/rocr-runtime/rocrtst/suites/negative/queue_validation.cc @@ -57,7 +57,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kMaxQueueSizeForAgent = 1024; static const uint32_t kMaxQueue = 64; diff --git a/projects/rocr-runtime/rocrtst/suites/performance/dispatch_time.cc b/projects/rocr-runtime/rocrtst/suites/performance/dispatch_time.cc index 0e4ca03cad..bfccb5ec27 100755 --- a/projects/rocr-runtime/rocrtst/suites/performance/dispatch_time.cc +++ b/projects/rocr-runtime/rocrtst/suites/performance/dispatch_time.cc @@ -54,7 +54,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" DispatchTime:: DispatchTime(bool defaultInterrupt, bool launchSingleKernel) : TestBase(), diff --git a/projects/rocr-runtime/rocrtst/suites/performance/enqueueLatency.cc b/projects/rocr-runtime/rocrtst/suites/performance/enqueueLatency.cc index 282d9d9475..5fe92a191b 100755 --- a/projects/rocr-runtime/rocrtst/suites/performance/enqueueLatency.cc +++ b/projects/rocr-runtime/rocrtst/suites/performance/enqueueLatency.cc @@ -54,7 +54,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" #define RET_IF_HSA_ERR(err) { \ if ((err) != HSA_STATUS_SUCCESS) { \ diff --git a/projects/rocr-runtime/rocrtst/suites/stress/memory_concurrent_tests.cc b/projects/rocr-runtime/rocrtst/suites/stress/memory_concurrent_tests.cc index b993c008cf..d5353e95b1 100755 --- a/projects/rocr-runtime/rocrtst/suites/stress/memory_concurrent_tests.cc +++ b/projects/rocr-runtime/rocrtst/suites/stress/memory_concurrent_tests.cc @@ -59,7 +59,6 @@ #include "common/concurrent_utils.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" static const uint32_t kNumThreads = 1024; diff --git a/projects/rocr-runtime/rocrtst/suites/stress/queue_write_index_concurrent_tests.cc b/projects/rocr-runtime/rocrtst/suites/stress/queue_write_index_concurrent_tests.cc index 59d8fdc7cb..f9bfd71221 100755 --- a/projects/rocr-runtime/rocrtst/suites/stress/queue_write_index_concurrent_tests.cc +++ b/projects/rocr-runtime/rocrtst/suites/stress/queue_write_index_concurrent_tests.cc @@ -59,7 +59,6 @@ #include "common/concurrent_utils.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" enum memoryOrdering { SCACQ_SCREL, diff --git a/projects/rocr-runtime/rocrtst/suites/test_common/test_case_template.cc b/projects/rocr-runtime/rocrtst/suites/test_common/test_case_template.cc index bf483966c1..87880abe86 100755 --- a/projects/rocr-runtime/rocrtst/suites/test_common/test_case_template.cc +++ b/projects/rocr-runtime/rocrtst/suites/test_common/test_case_template.cc @@ -107,7 +107,6 @@ #include "common/hsatimer.h" #include "gtest/gtest.h" #include "hsa/hsa.h" -#include "hsa/hsa_ext_finalize.h" #ifdef ROCRTST_EMULATOR_BUILD static const uint32_t kNumBufferElements = 4;