CI: Add RAN-SA-FHI72-Timing-Phytest into parent pipeline

ci-scripts/Jenkinsfile-GitLab-Container

@@ -632,6 +632,29 @@ pipeline {
             }
           }
         }
+        stage ("SA-FHI72-Timing-Phytest") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-SA-FHI72-Timing-Phytest', 'SA-FHI72-Timing-Phytest')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                phytestFHI72Status = finalizeSlaveJob('RAN-SA-FHI72-Timing-Phytest')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += phytestFHI72Status
+              }
+            }
+          }
+        }
         stage ("LTE-TDD-2x2-Container") {
           when { expression {do4Gtest} }
           steps {

ci-scripts/datalog_rt_stats.100.4x4.fhi72.yaml

@@ -12,9 +12,9 @@ Ref :
   tx_fhaul : 40.2
   feptx_prec (per port, half_slot) : 12.3
   L1 Tx processing : 221.0
-  DLSCH encoding : 141.0
+  DLSCH encoding : 121.0
   L1 Rx processing : 332.5
-  UL segments decoding : 55.2
+  UL segments decoding : 45.2
   UL Indication : 0.4
   Slot Indication : 14.3
   PUSCH inner-receiver : 421.4

ci-scripts/run_locally.sh

@@ -27,7 +27,7 @@ set -x
 # docker build . -f docker/Dockerfile.base.ubuntu -t ran-base
 
 docker tag oai-nr-ue oai-ci/oai-nr-ue:develop-${SHORT_COMMIT_SHA}
-docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
+docker tag oai-gnb-fhi72 oai-ci/oai-gnb-fhi72:develop-${SHORT_COMMIT_SHA}
 docker tag oai-nr-cuup oai-ci/oai-nr-cuup:develop-${SHORT_COMMIT_SHA}
 
 python3 main.py --mode=InitiateHtml --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \

radio/COMMON/common_lib.h

@@ -33,8 +33,6 @@
 #define MAX_WRITE_THREAD_BUFFER_SIZE 8
 #define MAX_CARDS 10
 
-#define SAMPLES_BLOCK_HEADER_MAGIC 0xffefU
-
 typedef int64_t openair0_timestamp_t;
 typedef volatile int64_t openair0_vtimestamp_t;
 
@@ -624,7 +622,6 @@ struct openair0_device {
 };
 
 typedef struct {
-  uint32_t magic;
   uint32_t size;           // Number of samples per antenna to follow this header
   uint32_t nbAnt;          // Total number of antennas following this header
   // Samples per antenna follow this header,

radio/rfsimulator/simulator.cpp

@@ -966,7 +966,7 @@ static int rfsimulator_write_internal(rfsimulator_state_t *t,
     buffer_t *b = &t->buf[i];
 
     if (b->conn_sock >= 0) {
-      samplesBlockHeader_t header = {SAMPLES_BLOCK_HEADER_MAGIC, (uint32_t)nsamps, (uint32_t)nbAnt, (uint64_t)timestamp, 0, 0, beams_to_beam_map(tx_beams)};
+      samplesBlockHeader_t header = {(uint32_t)nsamps, (uint32_t)nbAnt, (uint64_t)timestamp, 0, 0, beams_to_beam_map(tx_beams)};
       fullwrite(b->conn_sock, &header, sizeof(header), t);
       int num_beams = tx_beams.size();
       // Send beams in order of beam index. This is required for beam_map to work correctly on the receiver side.
@@ -1018,8 +1018,6 @@ static int rfsimulator_write_beams(openair0_device_t *device,
                                    int num_beams,
                                    int flags)
 {
-  AssertFatal(nbAnt > 0, "Number of antennas not set\n");
-  AssertFatal(num_beams > 0, "Number of beams not set\n");
   timestamp -= device->openair0_cfg->command_line_sample_advance;
   int nsamps_initial = nsamps;
   rfsimulator_state_t *t = static_cast<rfsimulator_state_t *>(device->priv);
@@ -1081,7 +1079,7 @@ static bool add_client(rfsimulator_state_t *t)
   void *samplesVoid[t->tx_num_channels];
   for (int i = 0; i < t->tx_num_channels; i++)
     samplesVoid[i] = (void *)&v;
-  samplesBlockHeader_t header = {SAMPLES_BLOCK_HEADER_MAGIC, 1, (uint32_t)t->tx_num_channels, (uint64_t)t->lastWroteTS, 0, 0, 1};
+  samplesBlockHeader_t header = {1, (uint32_t)t->tx_num_channels, (uint64_t)t->lastWroteTS, 0, 0, 1};
   fullwrite(conn_sock, &header, sizeof(header), t);
   fullwrite(conn_sock, samplesVoid, sampleToByte(1, t->tx_num_channels), t);
 
@@ -1094,7 +1092,6 @@ static bool add_client(rfsimulator_state_t *t)
 static void process_recv_header(rfsimulator_state_t *t, buffer_t *b, bool first_time)
 {
   b->headerMode = false; // We got the header
-  AssertFatal(b->th.magic == SAMPLES_BLOCK_HEADER_MAGIC, "Incorrect magic number in header\n");
   AssertFatal(b->th.nbAnt != 0, "Number of antennas not set\n");
   if (b->nbAnt != b->th.nbAnt) {
     LOG_A(HW, "RFsim: Number of antennas changed from %d to %d\n", b->nbAnt, b->th.nbAnt);

radio/rfsimulator/stored_node.c

@@ -152,7 +152,6 @@ int main(int argc, char *argv[]) {
     setblocking(serviceSock, blocking);
 
     if ( raw ) {
-      header.magic = SAMPLES_BLOCK_HEADER_MAGIC;
       header.size=blockSize;
       header.nbAnt=1;
       header.timestamp=timestamp;