From 22e9bcf4247fec7f7bbc4c7e0f5602e76605612c Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Tue, 7 Apr 2020 06:57:42 -0400
Subject: [PATCH] Merge branch 'amd-master' into amd-master-next

Change-Id: I3094c15008093f2072bcd38aca4ea90aeae2d97b
---
 samples/0_Intro/module_api/defaultDriver.cpp    | 4 ++--
 samples/0_Intro/module_api/launchKernelHcc.cpp  | 4 ++--
 samples/0_Intro/module_api/runKernel.cpp        | 4 ++--
 samples/0_Intro/module_api_global/runKernel.cpp | 4 ++--
 samples/1_Utils/hipInfo/hipInfo.cpp             | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/samples/0_Intro/module_api/defaultDriver.cpp b/samples/0_Intro/module_api/defaultDriver.cpp
index ea36aabcf4..af8b413ac2 100644
--- a/samples/0_Intro/module_api/defaultDriver.cpp
+++ b/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;
 }
diff --git a/samples/0_Intro/module_api/launchKernelHcc.cpp b/samples/0_Intro/module_api/launchKernelHcc.cpp
index 38cf0d414c..90e569c5bc 100644
--- a/samples/0_Intro/module_api/launchKernelHcc.cpp
+++ b/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;
 }
diff --git a/samples/0_Intro/module_api/runKernel.cpp b/samples/0_Intro/module_api/runKernel.cpp
index a011b42666..1093b0dd54 100644
--- a/samples/0_Intro/module_api/runKernel.cpp
+++ b/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;
 }
diff --git a/samples/0_Intro/module_api_global/runKernel.cpp b/samples/0_Intro/module_api_global/runKernel.cpp
index 3a2804b7a2..4a2d49144c 100644
--- a/samples/0_Intro/module_api_global/runKernel.cpp
+++ b/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;
 }
diff --git a/samples/1_Utils/hipInfo/hipInfo.cpp b/samples/1_Utils/hipInfo/hipInfo.cpp
index e17f19675a..14faa7671b 100644
--- a/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/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;