Skip to content

Commit 9c0f140

Browse files
zkh2018zkh2018
committed
tests on: riscv-gnu-toolchain + busybear-linux + qemu-v3.0.0 + linux-v4.19 + riscv-pk
1 parent 1fdf95d commit 9c0f140

File tree

3 files changed

+56
-61
lines changed

3 files changed

+56
-61
lines changed

‎CMakeLists.txt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.cmake)
1212
include(${CMAKE_CURRENT_SOURCE_DIR}/config.cmake)
1313
endif()
1414

15-
if(ENABLE_RISCV)
15+
if(USE_RISCV)
16+
message(STATUS "using riscv")
1617
set(CMAKE_SYSTEM_NAME Generic)
1718
set(CMAKE_SYSTEM_PROCESSOR riscv)
1819
set(CMAKE_CROSSCOMPILING 1)
1920
set(CMAKE_CXX_COMPILER "riscv64-unknown-linux-gnu-g++")
2021
set(CMAKE_C_COMPILER "riscv64-unknown-linux-gnu-gcc")
2122
set(CMAKE_ASM_COMPILER "riscv64-unknown-linux-gnu-gcc")
23+
set(CMAKE_LINKER "riscv64-unknown-linux-gnu-ld")
24+
set(CMAKE_AR "riscv64-unknown-linux-gnu-ar")
2225
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
2326
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
2427
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -63,16 +66,6 @@ file(GLOB RUNTIME_SRCS src/core/*.cc
6366
file(GLOB CVM_SRCS src/compiler/*.cc
6467
src/pass/*.cc)
6568

66-
if(ENABLE_RISCV)
67-
message(STATUS "ENABLE RISCV")
68-
69-
file(GLOB RUNTIME_RISCV_SRCS src/runtime/formal/devapi/*.cc)
70-
list(APPEND RUNTIME_SRCS ${RUNTIME_RISCV_SRCS})
71-
72-
file(GLOB CVM_OPS_RISCV_SRCS src/runtime/formal/ops/*.cc)
73-
list(APPEND RUNTIME_SRCS ${CVM_OPS_RISCV_SRCS})
74-
endif()
75-
7669
if(ENABLE_CPU)
7770
message(STATUS "ENABLE CPU")
7871
file(GLOB CVM_OPS_CPU_SRCS src/runtime/cpu/ops/*.cc)
@@ -146,11 +139,11 @@ file(GLOB CVM_TOP_SRCS src/top/*.cc
146139
src/top/tensor/*.cc)
147140
list(APPEND RUNTIME_SRCS ${CVM_TOP_SRCS})
148141

149-
add_library(${EXECUTE_NAME} STATIC ${RUNTIME_SRCS})
142+
add_library(${EXECUTE_NAME} SHARED ${RUNTIME_SRCS})
150143
target_link_libraries(${EXECUTE_NAME} ${CVM_RUNTIME_LINKER_LIBS})
151144

152145
list(APPEND CVM_SRCS ${RUNTIME_SRCS})
153-
add_library(${LIBRARY_NAME} STATIC ${CVM_SRCS})
146+
add_library(${LIBRARY_NAME} SHARED ${CVM_SRCS})
154147
target_link_libraries(${LIBRARY_NAME} ${CVM_RUNTIME_LINKER_LIBS})
155148

156149

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ test_opencl: ${TEST_OPENCL}
4141
%_opencl: ${TESTS}/%.cc lib
4242
g++ -o ${BUILD}/${TESTS}/$@ $< -DDEVICE=3 -std=c++11 -I${INCLUDE} -L${BUILD} -lcvm_runtime -fopenmp -L/usr/local/cuda/lib64/ -lOpenCL -fsigned-char -pthread -Wl,-rpath=${BUILD}
4343

44-
%_riscv: ${TESTS}/%.cc lib
44+
#objs := $(wildcard ${BUILD}/obj/*.o)
45+
%_riscv: ${TESTS}/%.cc lib
4546
riscv64-unknown-linux-gnu-g++ -o ${BUILD}/${TESTS}/$@ $< -DDEVICE=2 -std=c++11 -I${INCLUDE} -L${BUILD} -pthread -lcvm -fsigned-char -Wl,-rpath=${BUILD}
4647
clean:
4748
rm -rf ./build/*

‎tests/test_model.cc

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -252,53 +252,54 @@ void test_thread() {
252252
int test_models(int device_type = 0) {
253253
std::cout << device_type << " DDDDDD" << std::endl;
254254
auto model_roots = {
255-
"/data/std_out/yolo_tfm",
256-
"/data/std_out/null",
257-
"/data/std_out/resnet50_mxg",
258-
"/data/std_out/ssd_512_mobilenet1.0_voc_tfm",
259-
"/data/std_out/resnet18_v1_tfm",
260-
"/data/std_out/resnet50_v2",
261-
"/data/std_out/qd10_resnet20_v2",
262-
"/data/std_out/trec",
263-
// "/data/new_cvm/yolo3_darknet53_voc/data",
264-
"/data/lz_model_storage/dcnet_mnist_v1/data",
265-
"/data/lz_model_storage/mobilenetv1.0_imagenet/data",
266-
"/data/lz_model_storage/resnet50_v1_imagenet/data",
267-
"/data/lz_model_storage/animal10/data",
268-
"/data/lz_model_storage/resnet50_v2/data",
269-
"/data/lz_model_storage/vgg16_gcv/data",
270-
"/data/lz_model_storage/sentiment_trec/data",
271-
"/data/lz_model_storage/vgg19_gcv/data",
272-
"/data/lz_model_storage/squeezenet_gcv1.1/data",
273-
"/data/lz_model_storage/squeezenet_gcv1.0/data",
274-
// invalid has strange attribute in operator elemwise_add.
275-
// "/data/lz_model_storage/octconv_resnet26_0.250/data",
276-
"/data/std_out/resnet50_mxg/",
277-
"/data/std_out/resnet50_v2",
278-
"/data/std_out/qd10_resnet20_v2",
279-
"/data/std_out/random_3_0/",
280-
"/data/std_out/random_3_1/",
281-
"/data/std_out/random_3_2/",
282-
"/data/std_out/random_3_3/",
283-
"/data/std_out/random_3_4/",
284-
"/data/std_out/random_3_5/",
285-
"/data/std_out/random_4_0/",
286-
"/data/std_out/random_4_1/",
287-
// "/data/std_out/random_4_2/",
288-
// "/data/std_out/random_4_3/",
289-
// "/data/std_out/random_4_4/",
290-
"/data/std_out/random_4_5/",
291-
"/data/std_out/random_4_6/",
292-
"/data/std_out/random_4_7/",
293-
"/data/std_out/random_4_8/",
294-
"/data/std_out/random_4_9/",
295-
"/data/std_out/log2",
296-
//"./tests/3145ad19228c1cd2d051314e72f26c1ce77b7f02/",
297-
"/data/std_out/lr_attr",
298-
// "/data/std_out/non_in",
299-
"/data/std_out/shufflenet",
300-
"/data/std_out/ssd",
301-
"/data/std_out/ssd_512_mobilenet1.0_coco_tfm/",
255+
"/data/std_out/cvm_mnist"
256+
// "/data/std_out/yolo_tfm",
257+
// "/data/std_out/null",
258+
// "/data/std_out/resnet50_mxg",
259+
// "/data/std_out/ssd_512_mobilenet1.0_voc_tfm",
260+
// "/data/std_out/resnet18_v1_tfm",
261+
// "/data/std_out/resnet50_v2",
262+
// "/data/std_out/qd10_resnet20_v2",
263+
// "/data/std_out/trec",
264+
// // "/data/new_cvm/yolo3_darknet53_voc/data",
265+
// "/data/lz_model_storage/dcnet_mnist_v1/data",
266+
// "/data/lz_model_storage/mobilenetv1.0_imagenet/data",
267+
// "/data/lz_model_storage/resnet50_v1_imagenet/data",
268+
// "/data/lz_model_storage/animal10/data",
269+
// "/data/lz_model_storage/resnet50_v2/data",
270+
// "/data/lz_model_storage/vgg16_gcv/data",
271+
// "/data/lz_model_storage/sentiment_trec/data",
272+
// "/data/lz_model_storage/vgg19_gcv/data",
273+
// "/data/lz_model_storage/squeezenet_gcv1.1/data",
274+
// "/data/lz_model_storage/squeezenet_gcv1.0/data",
275+
// // invalid has strange attribute in operator elemwise_add.
276+
// // "/data/lz_model_storage/octconv_resnet26_0.250/data",
277+
// "/data/std_out/resnet50_mxg/",
278+
// "/data/std_out/resnet50_v2",
279+
// "/data/std_out/qd10_resnet20_v2",
280+
// "/data/std_out/random_3_0/",
281+
// "/data/std_out/random_3_1/",
282+
// "/data/std_out/random_3_2/",
283+
// "/data/std_out/random_3_3/",
284+
// "/data/std_out/random_3_4/",
285+
// "/data/std_out/random_3_5/",
286+
// "/data/std_out/random_4_0/",
287+
// "/data/std_out/random_4_1/",
288+
// // "/data/std_out/random_4_2/",
289+
// // "/data/std_out/random_4_3/",
290+
// // "/data/std_out/random_4_4/",
291+
// "/data/std_out/random_4_5/",
292+
// "/data/std_out/random_4_6/",
293+
// "/data/std_out/random_4_7/",
294+
// "/data/std_out/random_4_8/",
295+
// "/data/std_out/random_4_9/",
296+
// "/data/std_out/log2",
297+
// //"./tests/3145ad19228c1cd2d051314e72f26c1ce77b7f02/",
298+
// "/data/std_out/lr_attr",
299+
// // "/data/std_out/non_in",
300+
// "/data/std_out/shufflenet",
301+
// "/data/std_out/ssd",
302+
// "/data/std_out/ssd_512_mobilenet1.0_coco_tfm/",
302303
};
303304
for (auto model_root : model_roots) {
304305
auto ret = run_LIF(model_root, device_type);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy