Fixes for 8 GPU full system test configuration

Author: davidrohr

prodtests/full-system-test/datadistribution.sh

@@ -10,7 +10,7 @@ fi
 
 export DATADIST_SHM_DELAY=10
 export TF_DIR=./raw/timeframe
-export TFRATE=$(awk "BEGIN {printf \"%.6f\",1/$NTIMEFRAMES}")
+export TFRATE=$(awk "BEGIN {printf \"%.6f\",1/$TFDELAY}")
 
 ARGS_ALL="--session default --severity $SEVERITY --shm-segment-size $SHMSIZE --no-cleanup"
 

prodtests/full-system-test/dpl-workflow.sh

@@ -17,7 +17,7 @@ if [ $SHMTHROW == 0 ]; then
 fi
 
 if [ $EXTINPUT == 1 ]; then
-  CMD_X="B:TPC/RAWDATA;C:ITS/RAWDATA;D:TOF/RAWDATA;D:MFT/RAWDATA;E:FT0/RAWDATA;F:MID/RAWDATA"
+  CMD_X="B:TPC/RAWDATA;C:ITS/RAWDATA;D:TOF/RAWDATA;D:MFT/RAWDATA;E:FT0/RAWDATA;F:MID/RAWDATA;G:EMC/RAWDATA;H:PHS/RAWDATA"
   CMD_Y="name=readout-proxy,type=pull,method=connect,address=ipc://@stfb-to-dpl$1,transport=shmem,rateLogging=0"
   CMD_INPUT="o2-dpl-raw-proxy $ARGS_ALL --dataspec $CMD_X --channel-config $CMD_Y"
 else

prodtests/full-system-test/raw-reader.sh

@@ -8,6 +8,12 @@ fi
 MYDIR="$(dirname $(readlink -f $0))"
 source $MYDIR/setenv.sh
 
-ARGS_ALL="--session default --severity $SEVERITY --shm-throw-bad-alloc 0 --shm-segment-size $SHMSIZE --no-cleanup"
+ARGS_ALL="--session default --severity $SEVERITY --shm-throw-bad-alloc 0 --no-cleanup"
+if [ $NUMAGPUIDS == 1 ]; then
+  TMPSIZE=$(expr $DDSHMSIZE \* 1024 \* 1024)
+  ARGS_ALL+=" --shm-segment-id 2 --shm-segment-size $TMPSIZE --shm-mlock-segment 1 --shm-zero-segment 1"
+else
+  ARGS_ALL+=" --shm-segment-size $SHMSIZE"
+fi
 
-o2-raw-file-reader-workflow $ARGS_ALL --loop $NTIMEFRAMES --delay $TFDELAY --input-conf rawAll.cfg --configKeyValues "HBFUtils.nHBFPerTF=$NHBPERTF;" --max-tf 0  --raw-channel-config "name=dpl-chan,type=push,method=bind,address=ipc://@stfb-to-dpl,transport=shmem,rateLogging=0"
+o2-raw-file-reader-workflow $ARGS_ALL --loop $NTIMEFRAMES --delay $TFDELAY --input-conf rawAll.cfg --configKeyValues "HBFUtils.nHBFPerTF=$NHBPERTF;" --max-tf 0  --raw-channel-config "name=dpl-chan,type=push,method=bind,address=ipc://@stfb-to-dpl,transport=shmem,rateLogging=0" --run

prodtests/full-system-test/start_tmux.sh

@@ -12,21 +12,30 @@ source $MYDIR/setenv.sh
 export NGPUS=4
 export GPUTYPE=HIP
 export SHMSIZE=$(( 128 << 30 ))
+export DDSHMSIZE=$(( 64 << 10 ))
+export GPUMEMSIZE=$(( 24 << 30 ))
 export NUMAGPUIDS=1
 export EXTINPUT=1
 export EPNPIPELINES=1
 export SYNCMODE=1
 export SHMTHROW=0
+export SEVERITY=error
 
 if [ $1 == "dd" ]; then
   export CMD=datadistribution.sh
 else
   export CMD=raw-reader.sh
+  export NTIMEFRAMES=1000000
+fi
+
+if [ ! -f matbud.root -a -f ctf_dictionary.root ]; then
+  echo matbud.root or ctf_dictionary.root missing
+  exit 1
 fi
 
 rm -f /dev/shm/*fmq*
 
 tmux \
-    new-session "NUMAID=0 numactl --membind 0 --cpunodebind 0 $MYDIR/dpl-workflow.sh" \; \
-    split-window "NUMAID=1 numactl --membind 1 --cpunodebind 1 $MYDIR/dpl-workflow.sh" \; \
-    split-window "sleep 30; numactl --cpunodebind 0 --interleave=all $MYDIR/$CMD"
+    new-session "NUMAID=0 numactl --membind 0 --cpunodebind 0 $MYDIR/dpl-workflow.sh; echo END; sleep 1000" \; \
+    split-window "sleep 30; NUMAID=1 numactl --membind 1 --cpunodebind 1 $MYDIR/dpl-workflow.sh; echo END; sleep 1000" \; \
+    split-window "sleep 60; numactl --interleave=all $MYDIR/$CMD; echo END; sleep 1000"