Merge branch 'amd-master' into amd-master-next

Change-Id: I3094c15008093f2072bcd38aca4ea90aeae2d97b


[ROCm/hip-tests commit: 22e9bcf424]

projects/hip-tests/samples/0_Intro/module_api/defaultDriver.cpp

@@ -80,8 +80,8 @@ int main() {
 
     hipFree(Ad);
     hipFree(Bd);
-    delete A;
-    delete B;
+    delete[] A;
+    delete[] B;
     hipCtxDestroy(context);
     return 0;
 }

projects/hip-tests/samples/0_Intro/module_api/launchKernelHcc.cpp

@@ -107,8 +107,8 @@ int main() {
 
     hipFree(Ad);
     hipFree(Bd);
-    delete A;
-    delete B;
+    delete[] A;
+    delete[] B;
     hipCtxDestroy(context);
     return 0;
 }

projects/hip-tests/samples/0_Intro/module_api/runKernel.cpp

@@ -99,8 +99,8 @@ int main() {
 
     hipFree(Ad);
     hipFree(Bd);
-    delete A;
-    delete B;
+    delete[] A;
+    delete[] B;
     hipCtxDestroy(context);
     return 0;
 }

projects/hip-tests/samples/0_Intro/module_api_global/runKernel.cpp

@@ -154,8 +154,8 @@ int main() {
 
     hipFree(Ad);
     hipFree(Bd);
-    delete A;
-    delete B;
+    delete[] A;
+    delete[] B;
     hipCtxDestroy(context);
     return 0;
 }

projects/hip-tests/samples/1_Utils/hipInfo/hipInfo.cpp

@@ -56,6 +56,7 @@ void printCompilerInfo() {
 #endif
 }
 
+double bytesToKB(size_t s) { return (double)s / (1024.0); }
 double bytesToGB(size_t s) { return (double)s / (1024.0 * 1024.0 * 1024.0); }
 
 #define printLimit(w1, limit, units)                                                               \
@@ -97,7 +98,7 @@ void printDeviceProp(int deviceId) {
     cout << setw(w1) << "totalGlobalMem: " << fixed << setprecision(2)
          << bytesToGB(props.totalGlobalMem) << " GB" << endl;
     cout << setw(w1) << "maxSharedMemoryPerMultiProcessor: " << fixed << setprecision(2)
-         << bytesToGB(props.maxSharedMemoryPerMultiProcessor) << " GB" << endl;
+         << bytesToKB(props.maxSharedMemoryPerMultiProcessor) << " KB" << endl;
     cout << setw(w1) << "totalConstMem: " << props.totalConstMem << endl;
     cout << setw(w1) << "sharedMemPerBlock: " << (float)props.sharedMemPerBlock / 1024.0 << " KB"
          << endl;