diff --git a/tests/performance/compute/hipPerfDotProduct.cpp b/tests/performance/compute/hipPerfDotProduct.cpp
index 140aacd071..2826d05bae 100644
--- a/tests/performance/compute/hipPerfDotProduct.cpp
+++ b/tests/performance/compute/hipPerfDotProduct.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2020 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/compute/hipPerfMandelbrot.cpp b/tests/performance/compute/hipPerfMandelbrot.cpp
index c4234d8c37..dcf4da9b21 100644
--- a/tests/performance/compute/hipPerfMandelbrot.cpp
+++ b/tests/performance/compute/hipPerfMandelbrot.cpp
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/dispatch/hipPerfDispatchSpeed.cpp b/tests/performance/dispatch/hipPerfDispatchSpeed.cpp
index 278958c4d5..2eb4e083aa 100644
--- a/tests/performance/dispatch/hipPerfDispatchSpeed.cpp
+++ b/tests/performance/dispatch/hipPerfDispatchSpeed.cpp
@@ -1,3 +1,28 @@
+/*
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+/* HIT_START
+ * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t
+ * HIT_END
+ */
+
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -6,12 +31,6 @@
 #include "timer.h"
 #include "test_common.h"
 
-/* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvidia
- * TEST: %t
- * HIT_END
- */
-
 // Quiet pesky warnings
 #ifdef WIN_OS
 #define SNPRINTF sprintf_s
diff --git a/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp b/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp
index badb13e36f..b3d2d97b8c 100644
--- a/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp
+++ b/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp
@@ -1,3 +1,28 @@
+/*
+Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+/* HIT_START
+ * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t
+ * HIT_END
+ */
+
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -6,12 +31,6 @@
 #include "timer.h"
 #include "test_common.h"
 
-/* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvidia
- * TEST: %t
- * HIT_END
- */
-
 // Quiet pesky warnings
 #ifdef WIN_OS
 #define SNPRINTF sprintf_s
diff --git a/tests/performance/memory/hipPerfBufferCopySpeed.cpp b/tests/performance/memory/hipPerfBufferCopySpeed.cpp
index 36b482dbf5..3dd2d5c7e2 100644
--- a/tests/performance/memory/hipPerfBufferCopySpeed.cpp
+++ b/tests/performance/memory/hipPerfBufferCopySpeed.cpp
@@ -1,3 +1,28 @@
+/*
+Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+/* HIT_START
+ * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t
+ * HIT_END
+ */
+
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -6,12 +31,6 @@
 #include "timer.h"
 #include "test_common.h"
 
-/* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvidia
- * TEST: %t
- * HIT_END
- */
-
 // Quiet pesky warnings
 #ifdef WIN_OS
 #define SNPRINTF sprintf_s
diff --git a/tests/performance/memory/hipPerfDevMemReadSpeed.cpp b/tests/performance/memory/hipPerfDevMemReadSpeed.cpp
index 181cd37f24..b211188714 100644
--- a/tests/performance/memory/hipPerfDevMemReadSpeed.cpp
+++ b/tests/performance/memory/hipPerfDevMemReadSpeed.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/memory/hipPerfDevMemWriteSpeed.cpp b/tests/performance/memory/hipPerfDevMemWriteSpeed.cpp
index 4d706cdde9..69baef269c 100644
--- a/tests/performance/memory/hipPerfDevMemWriteSpeed.cpp
+++ b/tests/performance/memory/hipPerfDevMemWriteSpeed.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/memory/hipPerfHostNumaAlloc.cpp b/tests/performance/memory/hipPerfHostNumaAlloc.cpp
index a5e60c8549..3a45913c7f 100644
--- a/tests/performance/memory/hipPerfHostNumaAlloc.cpp
+++ b/tests/performance/memory/hipPerfHostNumaAlloc.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -17,6 +17,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD_CMD: hipPerfHostNumaAlloc %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -lnuma -o %T/%t EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t
+ * HIT_END
+ */
+
 #include "test_common.h"
 #include <iostream>
 #include <time.h>
@@ -33,11 +39,6 @@ THE SOFTWARE.
 #include <string>
 #include <array>
 #include "hip/hip_runtime.h"
-/* HIT_START
- * BUILD_CMD: hipPerfHostNumaAlloc %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -lnuma -o %T/%t EXCLUDE_HIP_PLATFORM nvcc
- * TEST: %t
- * HIT_END
- */
 
 // To run it correctly, we must not export HIP_VISIBLE_DEVICES.
 // And we must explicitly link libnuma because of numa api move_pages().
diff --git a/tests/performance/memory/hipPerfMemcpy.cpp b/tests/performance/memory/hipPerfMemcpy.cpp
index 9d7dbc4e95..2af8ea8d6e 100644
--- a/tests/performance/memory/hipPerfMemcpy.cpp
+++ b/tests/performance/memory/hipPerfMemcpy.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/memory/hipPerfSampleRate.cpp b/tests/performance/memory/hipPerfSampleRate.cpp
index b9e041e88e..040903e67a 100644
--- a/tests/performance/memory/hipPerfSampleRate.cpp
+++ b/tests/performance/memory/hipPerfSampleRate.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2020 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/memory/hipPerfSharedMemReadSpeed.cpp b/tests/performance/memory/hipPerfSharedMemReadSpeed.cpp
index 86adc5f354..63be529fd0 100644
--- a/tests/performance/memory/hipPerfSharedMemReadSpeed.cpp
+++ b/tests/performance/memory/hipPerfSharedMemReadSpeed.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/module/hipPerfModuleLoad.cpp b/tests/performance/module/hipPerfModuleLoad.cpp
index 06f55ed89d..f3bc98a212 100755
--- a/tests/performance/module/hipPerfModuleLoad.cpp
+++ b/tests/performance/module/hipPerfModuleLoad.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD_CMD: hipPerfModuleLoad %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -o %T/%t EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD_CMD: hipPerfModuleLoad %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -o %T/%t EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/stream/hipPerfDeviceConcurrency.cpp b/tests/performance/stream/hipPerfDeviceConcurrency.cpp
index 7d6699a9a2..afa35d5e1a 100644
--- a/tests/performance/stream/hipPerfDeviceConcurrency.cpp
+++ b/tests/performance/stream/hipPerfDeviceConcurrency.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2020 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/stream/hipPerfStreamConcurrency.cpp b/tests/performance/stream/hipPerfStreamConcurrency.cpp
index 81dc5626c7..9922cfdaa9 100644
--- a/tests/performance/stream/hipPerfStreamConcurrency.cpp
+++ b/tests/performance/stream/hipPerfStreamConcurrency.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2020 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/stream/hipPerfStreamCreateCopyDestroy.cpp b/tests/performance/stream/hipPerfStreamCreateCopyDestroy.cpp
index bd194ba3fe..d582c9489b 100644
--- a/tests/performance/stream/hipPerfStreamCreateCopyDestroy.cpp
+++ b/tests/performance/stream/hipPerfStreamCreateCopyDestroy.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2020 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -18,7 +18,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */