Make HIP_VDI the default
As this snippet shows, HCC is no longer supported by roctracer: #if HIP_VDI ... #else #error HCC support dropped #endif Removed HIP_VDI from the CMakeLists.txt, and the source code. Change-Id: Ib273da2a5af6d67fa1b021a7eca3ff785c8b9c73
Cette révision appartient à :
révisé par
Laurent Morichetti
Parent
faada3e569
révision
8fb3cdb30b
@@ -52,7 +52,7 @@ set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
|
||||
## build HIP tests
|
||||
set ( GEN_INC_DIR ${PROJECT_BINARY_DIR}/inc )
|
||||
set ( INC_PATH "${INC_PATH} ${GEN_INC_DIR}" )
|
||||
set ( TEST_ENV HIP_VDI=${HIP_VDI} ROCM_PATH=${ROCM_ROOT_DIR} HSA_PATH=${ROCM_ROOT_DIR}/hsa INC_PATH=${INC_PATH} LIB_PATH=${LIB_PATH} HIPCC_VERBOSE=3 )
|
||||
set ( TEST_ENV ROCM_PATH=${ROCM_ROOT_DIR} HSA_PATH=${ROCM_ROOT_DIR}/hsa INC_PATH=${INC_PATH} LIB_PATH=${LIB_PATH} HIPCC_VERBOSE=3 )
|
||||
add_custom_target( mytest
|
||||
COMMAND ${TEST_ENV} make -C "${TEST_DIR}/MatrixTranspose"
|
||||
COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test"
|
||||
|
||||
@@ -17,7 +17,7 @@ TARGET=hcc
|
||||
|
||||
EXECUTABLE=./MatrixTranspose
|
||||
OBJECTS = MatrixTranspose.o
|
||||
FLAGS =-g $(INC_PATH:%=-I%) -I$(ROCM_PATH)/hsa/include/hsa -I$(ROCM_PATH)/hsa/include -I$(ROCM_PATH)/hip/include -I$(ROCM_PATH)/include -DLOCAL_BUILD=1 -DHIP_VDI=${HIP_VDI} -DITERATIONS=$(ITERATIONS) -DAMD_INTERNAL_BUILD=1
|
||||
FLAGS =-g $(INC_PATH:%=-I%) -I$(ROCM_PATH)/hsa/include/hsa -I$(ROCM_PATH)/hsa/include -I$(ROCM_PATH)/hip/include -I$(ROCM_PATH)/include -DLOCAL_BUILD=1 -DITERATIONS=$(ITERATIONS) -DAMD_INTERNAL_BUILD=1
|
||||
|
||||
ifeq ($(C_TEST), 1)
|
||||
COMP=${CC}
|
||||
|
||||
@@ -567,14 +567,6 @@ void hip_api_flush_cb(hip_api_trace_entry_t* entry) {
|
||||
cxx_demangle(entry->name),
|
||||
data->args.hipExtModuleLaunchKernel.hStream);
|
||||
break;
|
||||
#if !HIP_VDI
|
||||
case HIP_API_ID_hipHccModuleLaunchKernel:
|
||||
fprintf(hip_api_file_handle, "%s(kernel(%s) stream(%p))\n",
|
||||
oss.str().c_str(),
|
||||
cxx_demangle(entry->name),
|
||||
data->args.hipHccModuleLaunchKernel.hStream);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
fprintf(hip_api_file_handle, "%s()\n", oss.str().c_str());
|
||||
}
|
||||
|
||||
Référencer dans un nouveau ticket
Bloquer un utilisateur