From 3be9cc65f46206cbf2476108b01bdf1cf47ef0f4 Mon Sep 17 00:00:00 2001 From: Liang Zhou Date: Wed, 9 Aug 2023 20:19:41 +0800 Subject: [PATCH] fix the incorrect Intel NVMe device path 1. No matter whether the NVMe device is from Samsung or Intel, the NVMe device path is /dev/libnvm* , this is defined by the BaM NVMe kernel module, so for Intel NVMe devices we should not use /dev/libinvm*, which will lead to error. 2. the index of libnvm* should be "0,1,2,3,4..." instead of "0,1,4,9,2...", because if there are only 3 NVMe devices for BaM, the third one will be failed to be open because there's no /dev/libnvm4 in the host. Signed-off-by: Liang Zhou --- benchmarks/array/main.cu | 2 +- benchmarks/bfs/main.cu | 2 +- benchmarks/block/main.cu | 2 +- benchmarks/cc/main.cu | 2 +- benchmarks/vectoradd/main.cu | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/benchmarks/array/main.cu b/benchmarks/array/main.cu index 71451a16..811cddcb 100644 --- a/benchmarks/array/main.cu +++ b/benchmarks/array/main.cu @@ -37,7 +37,7 @@ using std::string; //uint32_t n_ctrls = 1; const char* const sam_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm4", "/dev/libnvm9", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8"}; -const char* const intel_ctrls_paths[] = {"/dev/libinvm0", "/dev/libinvm1", "/dev/libinvm4", "/dev/libinvm9", "/dev/libinvm2", "/dev/libinvm3", "/dev/libinvm5", "/dev/libinvm6", "/dev/libinvm7", "/dev/libinvm8"}; +const char* const intel_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; __global__ diff --git a/benchmarks/bfs/main.cu b/benchmarks/bfs/main.cu index bd0a3219..55904acc 100644 --- a/benchmarks/bfs/main.cu +++ b/benchmarks/bfs/main.cu @@ -60,7 +60,7 @@ using error = std::runtime_error; using std::string; //const char* const ctrls_paths[] = {"/dev/libnvm0","/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; const char* const sam_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm4", "/dev/libnvm9", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8"}; -const char* const intel_ctrls_paths[] = {"/dev/libinvm0", "/dev/libinvm1", "/dev/libinvm4", "/dev/libinvm9", "/dev/libinvm2", "/dev/libinvm3", "/dev/libinvm5", "/dev/libinvm6", "/dev/libinvm7", "/dev/libinvm8"}; +const char* const intel_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; //const char* const ctrls_paths[] = {"/dev/libnvm0"}; #define UINT64MAX 0xFFFFFFFFFFFFFFFF diff --git a/benchmarks/block/main.cu b/benchmarks/block/main.cu index 1a6b12a8..1ec1431c 100644 --- a/benchmarks/block/main.cu +++ b/benchmarks/block/main.cu @@ -40,7 +40,7 @@ using std::string; //uint32_t n_ctrls = 1; const char* const sam_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; -const char* const intel_ctrls_paths[] = {"/dev/libinvm0", "/dev/libinvm1", "/dev/libinvm4", "/dev/libinvm9", "/dev/libinvm2", "/dev/libinvm3", "/dev/libinvm5", "/dev/libinvm6", "/dev/libinvm7", "/dev/libinvm8"}; +const char* const intel_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; //const char* const ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9", "/dev/libnvm10", "/dev/libnvm11", "/dev/libnvm12", "/dev/libnvm13", "/dev/libnvm14", "/dev/libnvm15", "/dev/libnvm16", "/dev/libnvm17", "/dev/libnvm18", "/dev/libnvm19", "/dev/libnvm20", "/dev/libnvm21", "/dev/libnvm22", "/dev/libnvm23", "/dev/libnvm24","/dev/libnvm25", "/dev/libnvm26", "/dev/libnvm27", "/dev/libnvm28", "/dev/libnvm29", "/dev/libnvm30", "/dev/libnvm31"}; diff --git a/benchmarks/cc/main.cu b/benchmarks/cc/main.cu index b7495aa1..638976af 100644 --- a/benchmarks/cc/main.cu +++ b/benchmarks/cc/main.cu @@ -58,7 +58,7 @@ using std::string; //const char* const ctrls_paths[] = {"/dev/libnvmpro0", "/dev/libnvmpro1", "/dev/libnvmpro2", "/dev/libnvmpro3", "/dev/libnvmpro4", "/dev/libnvmpro5", "/dev/libnvmpro6", "/dev/libnvmpro7"}; //const char* const ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; const char* const sam_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm4", "/dev/libnvm9", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8"}; -const char* const intel_ctrls_paths[] = {"/dev/libinvm0", "/dev/libinvm1", "/dev/libinvm4", "/dev/libinvm9", "/dev/libinvm2", "/dev/libinvm3", "/dev/libinvm5", "/dev/libinvm6", "/dev/libinvm7", "/dev/libinvm8"}; +const char* const intel_ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; //const char* const ctrls_paths[] = {"/dev/libnvmpro0", "/dev/libnvmpro2", "/dev/libnvmpro3", "/dev/libnvmpro4", "/dev/libnvmpro5", "/dev/libnvmpro6", "/dev/libnvmpro7"}; //const char* const ctrls_paths[] = {"/dev/libnvmpro1"}; diff --git a/benchmarks/vectoradd/main.cu b/benchmarks/vectoradd/main.cu index bcfba320..04c9e3b1 100644 --- a/benchmarks/vectoradd/main.cu +++ b/benchmarks/vectoradd/main.cu @@ -56,8 +56,7 @@ using error = std::runtime_error; using std::string; //const char* const ctrls_paths[] = {"/dev/libnvmpro0", "/dev/libnvmpro1", "/dev/libnvmpro2", "/dev/libnvmpro3", "/dev/libnvmpro4", "/dev/libnvmpro5", "/dev/libnvmpro6", "/dev/libnvmpro7"}; -//const char* const ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; -const char* const ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm4", "/dev/libnvm9", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8"}; +const char* const ctrls_paths[] = {"/dev/libnvm0", "/dev/libnvm1", "/dev/libnvm2", "/dev/libnvm3", "/dev/libnvm4", "/dev/libnvm5", "/dev/libnvm6", "/dev/libnvm7", "/dev/libnvm8", "/dev/libnvm9"}; #define WARP_SHIFT 5 #define WARP_SIZE 32