Enable tests that are passing on hip-vdi

Change-Id: I7de965f7e8bb7e4d0fa61cd584f0cd118c1e212e
This commit is contained in:
agodavar
2020-03-03 13:33:52 +05:30
parent 33da3f5c50
commit 65ffaf82d8
12 changed files with 15 additions and 13 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 --gpu-architecture=sm_60 EXCLUDE_HIP_PLATFORM vdi
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 --gpu-architecture=sm_60
* TEST: %t
* HIT_END
*/
+1 -1
View File
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations EXCLUDE_HIP_PLATFORM vdi
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
* TEST: %t
* HIT_END
*/
+1 -1
View File
@@ -18,7 +18,7 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations EXCLUDE_HIP_PLATFORM vdi
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
* TEST: %t
* HIT_END
*/
+1 -1
View File
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --gpu-architecture=sm_35 EXCLUDE_HIP_PLATFORM vdi
* BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --gpu-architecture=sm_35
* TEST: %t
* HIT_END
*/
+1 -1
View File
@@ -22,7 +22,7 @@ THE SOFTWARE.
// Test the HCC-specific API extensions for HIP:
/* HIT_START
* BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc vdi
* BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc
* TEST: %t EXCLUDE_HIP_PLATFORM all
* HIT_END
*/
+1 -1
View File
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc vdi
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc
* TEST: %t EXCLUDE_HIP_PLATFORM nvcc
* HIT_END
*/
+1 -1
View File
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc vdi
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc
* TEST: %t EXCLUDE_HIP_PLATFORM nvcc
* HIT_END
*/
+1 -1
View File
@@ -19,7 +19,7 @@ THE SOFTWARE.
// Test the Grid_Launch syntax.
/* HIT_START
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
* TEST: %t
* HIT_END
*/
+1 -1
View File
@@ -23,7 +23,7 @@ THE SOFTWARE.
// Also serves as a template for other tests.
/* HIT_START
* BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
* BUILD: %t %s ../../test_common.cpp
* TEST: %t
* HIT_END
*/
@@ -18,8 +18,8 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc vdi
* BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
* BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc
* BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
* TEST: %t
* HIT_END
*/
+2 -2
View File
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/
/* HIT_START
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
* BUILD: %t %s ../test_common.cpp
* TEST: %t
* HIT_END
*/
@@ -66,7 +66,7 @@ void runTest(int width,int height,int num_layers,texture<T, hipTextureType2DLaye
myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height);
myparms.dstArray = arr;
myparms.extent = make_hipExtent(width , height, num_layers);
//myparms.kind = hipMemcpyHostToDevice;
myparms.kind = hipMemcpyHostToDevice;
HIPCHECK(hipMemcpy3D(&myparms));
// set texture parameters
+2
View File
@@ -1568,6 +1568,7 @@ hipError_t ihipMemcpy3D(const hipMemcpy3DParms* p,
if (p->srcArray != nullptr) {
pCopy.srcMemoryType = hipMemoryTypeArray;
pCopy.srcArray = p->srcArray;
// When reffering to array memory, hipPos::x is in elements.
pCopy.srcXInBytes *= hip::getElementSize(p->dstArray->Format);
}
@@ -1582,6 +1583,7 @@ hipError_t ihipMemcpy3D(const hipMemcpy3DParms* p,
if (p->dstArray != nullptr) {
pCopy.dstMemoryType = hipMemoryTypeArray;
pCopy.dstArray = p->dstArray;
// When reffering to array memory, hipPos::x is in elements.
pCopy.srcXInBytes *= hip::getElementSize(p->dstArray->Format);
}