Merge branch 'privatestaging' of https://github.com/AMDComputeLibraries/HIP-privatestaging into privatestaging

Conflicts:
	src/hip_hcc.cpp
	tests/src/CMakeLists.txt

samples/0_Intro/bit_extract/bit_extract.cpp

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     int deviceId;
     CHECK (hipGetDevice(&deviceId));
 	hipDeviceProp_t props;
-	CHECK(hipDeviceGetProperties(&props, deviceId));
+	CHECK(hipGetDeviceProperties(&props, deviceId));
 	printf ("info: running on device #%d %s\n", deviceId, props.name);
 
 

samples/0_Intro/square/square.hipref.cpp

@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 	size_t Nbytes = N * sizeof(float);
 
 	hipDeviceProp_t props;
-	CHECK(hipDeviceGetProperties(&props, 0/*deviceID*/));
+	CHECK(hipGetDeviceProperties(&props, 0/*deviceID*/));
 	printf ("info: running on device %s\n", props.name);
 
 	printf ("info: allocate host mem (%6.2f MB)\n", 2*Nbytes/1024.0/1024.0);

samples/1_Utils/hipInfo/hipInfo.cpp

@@ -73,7 +73,7 @@ void printDeviceProp (int deviceId)
     cout << setw(w1) << "device#" << deviceId << endl;
 
     hipDeviceProp_t props;
-    HIPCHECK(hipDeviceGetProperties(&props, deviceId));
+    HIPCHECK(hipGetDeviceProperties(&props, deviceId));
 
     cout << setw(w1) << "Name: " << props.name << endl;
     cout << setw(w1) << "pciBusID: " << props.pciBusID << endl;