\n')
terminate_ue_flag = True
- SSH.GetAllUEDevices(terminate_ue_flag)
+ if (self.ADBIPAddress != 'none'):
+ self.GetAllUEDevices(terminate_ue_flag)
+ self.GetAllCatMDevices(terminate_ue_flag)
+ else:
+ self.UEDevices.append('doughq9rehg')
+ self.UEDevices.append('dnsgiuahgia')
+ self.UEDevices.append('uehgieng9')
self.htmlUEConnected = len(self.UEDevices)
- self.htmlFile.write('
\n')
+ self.htmlFile.close()
- self.htmlFile.write('
' + str(self.htmlUEConnected) + ' UE(s) is(are) connected to ADB bench server
\n')
- self.htmlFile.write('
\n')
-
- self.htmlFile.write('
Test Summary for ' + SSH.testXMLfile + '
\n')
- self.htmlFile.write('
\n')
+ def CreateHtmlTabHeader(self):
+ if (not self.htmlHeaderCreated):
+ if (not os.path.isfile('test_results.html')):
+ self.CreateHtmlHeader()
+ self.htmlFile = open('test_results.html', 'a')
+ if (self.nbTestXMLfiles == 1):
+ self.htmlFile.write(' \n')
+ self.htmlFile.write('
Test Summary for ' + self.testXMLfiles[0] + '
\n')
+ else:
+ self.htmlFile.write('
\n')
+ self.htmlFile.write('
\n')
self.htmlFile.write(' \n')
self.htmlFile.write(' | Test Id | \n')
self.htmlFile.write(' Test Desc | \n')
self.htmlFile.write(' Test Options | \n')
self.htmlFile.write(' Test Status | \n')
+ if (self.htmlUEConnected == -1):
+ terminate_ue_flag = True
+ if (self.ADBIPAddress != 'none'):
+ self.GetAllUEDevices(terminate_ue_flag)
+ self.GetAllCatMDevices(terminate_ue_flag)
+ else:
+ self.UEDevices.append('doughq9rehg')
+ self.UEDevices.append('dnsgiuahgia')
+ self.UEDevices.append('uehgieng9')
+ self.htmlUEConnected = len(self.UEDevices)
+
i = 0
while (i < self.htmlUEConnected):
self.htmlFile.write(' UE' + str(i) + ' Status | \n')
@@ -1786,26 +2148,64 @@ class SSHConnection():
self.htmlFile.write('
\n')
self.htmlHeaderCreated = True
- def CreateHtmlFooter(self, passStatus):
+ def CreateHtmlTabFooter(self, passStatus):
if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
- self.htmlFile.write(' \n')
- self.htmlFile.write(' | Final Status | \n')
+ self.htmlFile.write('
\n')
+ self.htmlFile.write(' | Final Tab Status | \n')
if passStatus:
- self.htmlFile.write(' PASS | \n')
+ self.htmlFile.write(' PASS | \n')
else:
- self.htmlFile.write(' FAIL | \n')
+ self.htmlFile.write(' FAIL | \n')
self.htmlFile.write('
\n')
self.htmlFile.write('
\n')
- self.htmlFile.write('\n')
+ self.htmlFile.write('
\n')
+ self.htmlFooterCreated = False
+
+ def CreateHtmlFooter(self, passStatus):
+ if (os.path.isfile('test_results.html')):
+ self.RetrieveSystemVersion()
+ self.htmlFile = open('test_results.html', 'a')
+ self.htmlFile.write('
\n')
+ self.htmlFile.write(' \n')
+ self.htmlFile.write(' | eNB Server Characteristics | \n')
+ self.htmlFile.write('
\n')
+ self.htmlFile.write(' \n')
+ self.htmlFile.write(' | OS Version | \n')
+ self.htmlFile.write(' ' + self.eNBOsVersion + ' | \n')
+ self.htmlFile.write(' Kernel Version | \n')
+ self.htmlFile.write(' ' + self.eNBKernelVersion + ' | \n')
+ self.htmlFile.write(' UHD Version | \n')
+ self.htmlFile.write(' ' + self.eNBUhdVersion + ' | \n')
+ self.htmlFile.write('
\n')
+ self.htmlFile.write(' \n')
+ self.htmlFile.write(' | Nb CPUs | \n')
+ self.htmlFile.write(' ' + self.eNBCpuNb + ' | \n')
+ self.htmlFile.write(' CPU Model Name | \n')
+ self.htmlFile.write(' ' + self.eNBCpuModel + ' | \n')
+ self.htmlFile.write(' CPU Frequency | \n')
+ self.htmlFile.write(' ' + self.eNBCpuMHz + ' | \n')
+ self.htmlFile.write('
\n')
+ self.htmlFile.write(' \n')
+ self.htmlFile.write(' | Final Status | \n')
+ if passStatus:
+ self.htmlFile.write(' PASS | \n')
+ else:
+ self.htmlFile.write(' FAIL | \n')
+ self.htmlFile.write('
\n')
+ self.htmlFile.write('
\n')
+ self.htmlFile.write(' \n')
+ self.htmlFile.write(' \n')
+ self.htmlFile.write('\n')
self.htmlFile.write('\n')
self.htmlFile.close()
- self.htmlFooterCreated = False
def CreateHtmlTestRow(self, options, status, processesStatus):
if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
self.htmlFile.write(' \n')
- self.htmlFile.write(' | ' + SSH.testCase_id + ' | \n')
- self.htmlFile.write(' ' + SSH.desc + ' | \n')
+ self.htmlFile.write(' ' + self.testCase_id + ' | \n')
+ self.htmlFile.write(' ' + self.desc + ' | \n')
self.htmlFile.write(' ' + str(options) + ' | \n')
if (str(status) == 'OK'):
self.htmlFile.write(' ' + str(status) + ' | \n')
@@ -1819,7 +2219,9 @@ class SSHConnection():
elif (processesStatus == ENB_PROCESS_ASSERTION):
self.htmlFile.write(' KO - eNB process ended in Assertion | \n')
elif (processesStatus == ENB_PROCESS_REALTIME_ISSUE):
- self.htmlFile.write(' KO - eNB process faced Real Time issue(s)/td>\n')
+ self.htmlFile.write(' | KO - eNB process faced Real Time issue(s) | \n')
+ elif (processesStatus == ENB_PROCESS_NOLOGFILE_TO_ANALYZE):
+ self.htmlFile.write(' OK | \n')
elif (processesStatus == HSS_PROCESS_FAILED):
self.htmlFile.write(' KO - HSS process not found | \n')
elif (processesStatus == MME_PROCESS_FAILED):
@@ -1838,10 +2240,11 @@ class SSHConnection():
if result is not None:
cellBgColor = 'red'
else:
- result = re.search('showed|Reestablishment', self.htmleNBFailureMsg)
+ result = re.search('showed|Reestablishment|Could not copy eNB logfile', self.htmleNBFailureMsg)
if result is not None:
cellBgColor = 'orange'
- self.htmlFile.write(' ' + self.htmleNBFailureMsg + ' | \n')
+ self.htmlFile.write(' ' + self.htmleNBFailureMsg + ' | \n')
self.htmleNBFailureMsg = ''
else:
i = 0
@@ -1854,8 +2257,8 @@ class SSHConnection():
if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
addOrangeBK = False
self.htmlFile.write('
\n')
- self.htmlFile.write(' | ' + SSH.testCase_id + ' | \n')
- self.htmlFile.write(' ' + SSH.desc + ' | \n')
+ self.htmlFile.write(' ' + self.testCase_id + ' | \n')
+ self.htmlFile.write(' ' + self.desc + ' | \n')
self.htmlFile.write(' ' + str(options) + ' | \n')
if (str(status) == 'OK'):
self.htmlFile.write(' ' + str(status) + ' | \n')
@@ -1869,7 +2272,7 @@ class SSHConnection():
if (i < ue_status):
if (not ue_queue.empty()):
if (addOrangeBK):
- self.htmlFile.write(' ' + str(ue_queue.get()) + ' | \n')
+ self.htmlFile.write(' ' + str(ue_queue.get()).replace('white', 'orange') + ' | \n')
else:
self.htmlFile.write(' ' + str(ue_queue.get()) + ' | \n')
else:
@@ -1899,12 +2302,15 @@ def Usage():
print(' --help Show this help.')
print(' --mode=[Mode]')
print(' TesteNB')
+ print(' InitiateHtml, FinalizeHtml')
print(' TerminateeNB, TerminateUE, TerminateHSS, TerminateMME, TerminateSPGW')
print(' LogCollectBuild, LogCollecteNB, LogCollectHSS, LogCollectMME, LogCollectSPGW, LogCollectPing, LogCollectIperf')
print(' --eNBIPAddress=[eNB\'s IP Address]')
print(' --eNBRepository=[eNB\'s Repository URL]')
print(' --eNBBranch=[eNB\'s Branch Name]')
print(' --eNBCommitID=[eNB\'s Commit Number]')
+ print(' --eNB_AllowMerge=[eNB\'s Allow Merge Request (with target branch)]')
+ print(' --eNBTargetBranch=[eNB\'s Target Branch in case of a Merge Request]')
print(' --eNBUserName=[eNB\'s Login User Name]')
print(' --eNBPassword=[eNB\'s Login Password]')
print(' --eNBSourceCodePath=[eNB\'s Source Code Path]')
@@ -1920,7 +2326,7 @@ def Usage():
print('------------------------------------------------------------')
def CheckClassValidity(action,id):
- if action != 'Build_eNB' and action != 'Initialize_eNB' and action != 'Terminate_eNB' and action != 'Initialize_UE' and action != 'Terminate_UE' and action != 'Attach_UE' and action != 'Detach_UE' and action != 'Ping' and action != 'Iperf' and action != 'Reboot_UE' and action != 'Initialize_HSS' and action != 'Terminate_HSS' and action != 'Initialize_MME' and action != 'Terminate_MME' and action != 'Initialize_SPGW' and action != 'Terminate_SPGW':
+ if action != 'Build_eNB' and action != 'Initialize_eNB' and action != 'Terminate_eNB' and action != 'Initialize_UE' and action != 'Terminate_UE' and action != 'Attach_UE' and action != 'Detach_UE' and action != 'Ping' and action != 'Iperf' and action != 'Reboot_UE' and action != 'Initialize_HSS' and action != 'Terminate_HSS' and action != 'Initialize_MME' and action != 'Terminate_MME' and action != 'Initialize_SPGW' and action != 'Terminate_SPGW' and action != 'Initialize_CatM_module' and action != 'Terminate_CatM_module' and action != 'Attach_CatM_module' and action != 'Detach_CatM_module' and action != 'IdleSleep':
logging.debug('ERROR: test-case ' + id + ' has wrong class ' + action)
return False
return True
@@ -1940,6 +2346,13 @@ def GetParametersFromXML(action):
if (SSH.eNB_instance is None):
SSH.eNB_instance = '0'
+ if action == 'Attach_UE':
+ nbMaxUEtoAttach = test.findtext('nbMaxUEtoAttach')
+ if (nbMaxUEtoAttach is None):
+ SSH.nbMaxUEtoAttach = -1
+ else:
+ SSH.nbMaxUEtoAttach = int(nbMaxUEtoAttach)
+
if action == 'Ping':
SSH.ping_args = test.findtext('ping_args')
SSH.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
@@ -1955,6 +2368,13 @@ def GetParametersFromXML(action):
logging.debug('ERROR: test-case has wrong profile ' + SSH.iperf_profile)
SSH.iperf_profile = 'balanced'
+ if action == 'IdleSleep':
+ string_field = test.findtext('idle_sleep_time_in_sec')
+ if (string_field is None):
+ SSH.idle_sleep_time = 5
+ else:
+ SSH.idle_sleep_time = int(string_field)
+
#check if given test is in list
#it is in list if one of the strings in 'list' is at the beginning of 'test'
def test_in_list(test, list):
@@ -2001,6 +2421,9 @@ while len(argvs) > 1:
elif re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
SSH.eNBCommitID = matchReg.group(1)
+ elif re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+ matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
+ SSH.eNBTargetBranch = matchReg.group(1)
elif re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
SSH.eNBUserName = matchReg.group(1)
@@ -2042,7 +2465,13 @@ while len(argvs) > 1:
SSH.ADBPassword = matchReg.group(1)
elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
- SSH.testXMLfile = matchReg.group(1)
+ SSH.testXMLfiles.append(matchReg.group(1))
+ SSH.nbTestXMLfiles += 1
+ elif re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
+ matchReg = re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
+ finalStatus = matchReg.group(1)
+ if ((finalStatus == 'true') or (finalStatus == 'True')):
+ SSH.finalStatus = True
else:
Usage()
sys.exit('Invalid Parameter: ' + myArgv)
@@ -2108,26 +2537,49 @@ elif re.match('^LogCollectIperf$', mode, re.IGNORECASE):
Usage()
sys.exit('Insufficient Parameter')
SSH.LogCollectIperf()
+elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
+ if SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == '':
+ Usage()
+ sys.exit('Insufficient Parameter')
+ count = 0
+ foundCount = 0
+ while (count < SSH.nbTestXMLfiles):
+ xml_test_file = sys.path[0] + "/" + SSH.testXMLfiles[count]
+ if (os.path.isfile(xml_test_file)):
+ xmlTree = ET.parse(xml_test_file)
+ xmlRoot = xmlTree.getroot()
+ SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-' + str(count)))
+ SSH.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-' + str(count)))
+ SSH.htmlTabIcons.append(xmlRoot.findtext('htmlTabIcon',default='info-sign'))
+ foundCount += 1
+ count += 1
+ if foundCount != SSH.nbTestXMLfiles:
+ SSH.nbTestXMLfiles = foundCount
+ SSH.CreateHtmlHeader()
+elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
+ SSH.CreateHtmlFooter(SSH.finalStatus)
elif re.match('^TesteNB$', mode, re.IGNORECASE):
if SSH.eNBIPAddress == '' or SSH.eNBRepository == '' or SSH.eNBBranch == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '' or SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '' or SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == '':
Usage()
sys.exit('Insufficient Parameter')
- SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, sys.path[0] + "/tcp_iperf_stats.awk", "/tmp")
- SSH.CreateHtmlHeader()
-
+ if (SSH.EPCIPAddress != 'none'):
+ SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, sys.path[0] + "/tcp_iperf_stats.awk", "/tmp")
+ SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, sys.path[0] + "/active_net_interfaces.awk", "/tmp")
#read test_case_list.xml file
# if no parameters for XML file, use default value
- if SSH.testXMLfile == '':
+ if (SSH.nbTestXMLfiles != 1):
xml_test_file = sys.path[0] + "/test_case_list.xml"
else:
- xml_test_file = sys.path[0] + "/" + SSH.testXMLfile
+ xml_test_file = sys.path[0] + "/" + SSH.testXMLfiles[0]
xmlTree = ET.parse(xml_test_file)
xmlRoot = xmlTree.getroot()
exclusion_tests=xmlRoot.findtext('TestCaseExclusionList',default='')
requested_tests=xmlRoot.findtext('TestCaseRequestedList',default='')
+ if (SSH.nbTestXMLfiles == 1):
+ SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-0'))
all_tests=xmlRoot.findall('testCase')
exclusion_tests=exclusion_tests.split()
@@ -2165,6 +2617,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE):
signal.signal(signal.SIGUSR1, receive_signal)
+ SSH.CreateHtmlTabHeader()
+
for test_case_id in todo_tests:
for test in all_tests:
id = test.get('id')
@@ -2194,6 +2648,14 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE):
SSH.AttachUE()
elif action == 'Detach_UE':
SSH.DetachUE()
+ elif action == 'Initialize_CatM_module':
+ SSH.InitializeCatM()
+ elif action == 'Terminate_CatM_module':
+ SSH.TerminateCatM()
+ elif action == 'Attach_CatM_module':
+ SSH.AttachCatM()
+ elif action == 'Detach_CatM_module':
+ SSH.TerminateCatM()
elif action == 'Ping':
SSH.Ping()
elif action == 'Iperf':
@@ -2212,10 +2674,12 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE):
SSH.InitializeSPGW()
elif action == 'Terminate_SPGW':
SSH.TerminateSPGW()
+ elif action == 'IdleSleep':
+ SSH.IdleSleep()
else:
sys.exit('Invalid action')
- SSH.CreateHtmlFooter(True)
+ SSH.CreateHtmlTabFooter(True)
else:
Usage()
sys.exit('Invalid mode')
diff --git a/ci-scripts/oai-ci-vm-tool b/ci-scripts/oai-ci-vm-tool
index 940bcd2852..ed43e26729 100755
--- a/ci-scripts/oai-ci-vm-tool
+++ b/ci-scripts/oai-ci-vm-tool
@@ -39,7 +39,7 @@ function variant_usage {
echo " --variant phy-sim OR -v3"
echo " --variant cppcheck OR -v4"
echo " --variant gnb-usrp OR -v5"
- echo " --variant nu-ue-usrp OR -v6"
+ echo " --variant nr-ue-usrp OR -v6"
echo " --variant enb-ethernet OR -v7"
echo " --variant ue-ethernet OR -v8"
}
@@ -252,9 +252,9 @@ case $key in
VM_NAME=ci-phy-sim
ARCHIVES_LOC=phy_sim
LOG_PATTERN=.Rel15.txt
- NB_PATTERN_FILES=8
+ NB_PATTERN_FILES=9
BUILD_OPTIONS="--phy_simulators"
- VM_MEMORY=4096
+ VM_MEMORY=8192
RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"
NBARGS=$[$NBARGS+256]
shift
@@ -331,9 +331,9 @@ case $key in
VM_NAME=ci-phy-sim
ARCHIVES_LOC=phy_sim
LOG_PATTERN=.Rel15.txt
- NB_PATTERN_FILES=8
+ NB_PATTERN_FILES=9
BUILD_OPTIONS="--phy_simulators"
- VM_MEMORY=4096
+ VM_MEMORY=8192
RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"
NBARGS=$[$NBARGS+256]
;;
@@ -354,7 +354,7 @@ case $key in
BUILD_OPTIONS="--gNB -w USRP"
NBARGS=$[$NBARGS+256]
;;
- nu-ue-usrp)
+ nr-ue-usrp)
VM_NAME=ci-ue-nr-usrp
ARCHIVES_LOC=nrue_usrp
LOG_PATTERN=.Rel15.txt
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index 527fe48edb..da6649ed05 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -441,10 +441,16 @@ function run_test_on_vm {
echo "############################################################"
echo "Creating test EPC VM ($EPC_VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
+ acquire_vm_create_lock
uvt-kvm create $EPC_VM_NAME release=xenial --unsafe-caching
+ echo "Waiting for VM to be started"
+ uvt-kvm wait $EPC_VM_NAME --insecure
+ release_vm_create_lock
+ else
+ echo "Waiting for VM to be started"
+ uvt-kvm wait $EPC_VM_NAME --insecure
fi
- uvt-kvm wait $EPC_VM_NAME --insecure
EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
echo "$EPC_VM_NAME has for IP addr = $EPC_VM_IP_ADDR"
scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu
diff --git a/ci-scripts/tcp_iperf_stats.awk b/ci-scripts/tcp_iperf_stats.awk
index e5c64b6283..3a00e4555f 100644
--- a/ci-scripts/tcp_iperf_stats.awk
+++ b/ci-scripts/tcp_iperf_stats.awk
@@ -1,3 +1,23 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# * contact@openairinterface.org
+# */
BEGIN{max=0;min=10000}
{
if ($0 ~/Mbits/) {
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_build.xml b/ci-scripts/xml_files/enb_usrp210_band40_build.xml
new file mode 100644
index 0000000000..8f9489b03e
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band40_build.xml
@@ -0,0 +1,54 @@
+
+
+ build-tab
+ Build
+ wrench
+
+ 010101
+ 050101 060101 070101
+
+
+
+
+ Build_eNB
+ Build eNB (USRP)
+ -w USRP -c --eNB
+
+
+
+ Initialize_HSS
+ Initialize HSS
+
+
+
+ Initialize_MME
+ Initialize MME
+
+
+
+ Initialize_SPGW
+ Initialize SPGW
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml b/ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml
new file mode 100644
index 0000000000..ad34381a2a
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml
@@ -0,0 +1,47 @@
+
+
+ epc-closure
+ EPC-Closure
+ log-out
+
+ 050201 060201 070201
+
+
+
+
+ Terminate_HSS
+ Terminate HSS
+
+
+
+ Terminate_MME
+ Terminate MME
+
+
+
+ Terminate_SPGW
+ Terminate SPGW
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
new file mode 100644
index 0000000000..d5a25c7fa7
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
@@ -0,0 +1,119 @@
+
+
+ test-05-tm1
+ Test-05MHz-TM1
+ tasks
+
+ 040101
+ 030104 040301 040501 040602 040601 040603 040642 040641 040643 040401 040201 030201
+
+
+
+
+ Initialize_eNB
+ Initialize eNB (TDD/Band40/5MHz)
+ -O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+
+
+
+ Terminate_eNB
+ Terminate eNB
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (5MHz - 20 sec)
+ -c 20
+ 25
+
+
+
+ Iperf
+ iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)
+ -u -b 6.5M -t 30 -i 1
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)
+ -u -b 6.5M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)
+ -u -b 6.5M -t 30 -i 1
+ 50
+ unbalanced
+
+
+
+ Iperf
+ iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ unbalanced
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrpb210_band40.xml b/ci-scripts/xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
similarity index 51%
rename from ci-scripts/xml_files/enb_usrpb210_band40.xml
rename to ci-scripts/xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
index 1af1c319cf..ef50933d4a 100644
--- a/ci-scripts/xml_files/enb_usrpb210_band40.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
@@ -21,43 +21,21 @@
-->
+ test-10-tm1
+ Test-10MHz-TM1
+ tasks
- 010101
- 050101 060101 070101 040101
- 030104 040301 040501 040602 040601 040603 040642 040641 040643 040401 040201 030201
+ 040101
030114 040301 040511 040612 040611 040613 040652 040651 040653 040401 040201 030201
- 050201 060201 070201
-
-
-
- Build_eNB
- Build eNB (USRP)
- -w USRP -c --eNB
-
-
-
- Initialize_eNB
- Initialize eNB (TDD/Band40/5MHz)
- -O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf --codingw --fepw
-
-
Initialize_eNB
Initialize eNB (TDD/Band40/10MHz/info)
- -O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf --codingw --fepw
+ -O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
-
- Initialize_eNB
- Initialize eNB (TDD/Band40/20MHz/info)
- -O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf --codingw --fepw
-
-
Terminate_eNB
Terminate eNB
@@ -83,13 +61,6 @@
Detach UE
-
- Ping
- ping (5MHz - 20 sec)
- -c 20
- 25
-
-
Ping
ping (10MHz - 20 sec)
@@ -97,30 +68,6 @@
25
-
- Iperf
- iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)
- -u -b 6.5M -t 30 -i 1
- 50
- balanced
-
-
-
- Iperf
- iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)
- -u -b 6.5M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)
- -u -b 6.5M -t 30 -i 1
- 50
- unbalanced
-
-
Iperf
iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)
@@ -145,30 +92,6 @@
unbalanced
-
- Iperf
- iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)
- -u -b 2M -t 30 -i 1 -R
- 50
- balanced
-
-
-
- Iperf
- iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
- -u -b 2M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)
- -u -b 2M -t 30 -i 1 -R
- 50
- unbalanced
-
-
Iperf
iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)
@@ -193,34 +116,4 @@
unbalanced
-
- Initialize_HSS
- Initialize HSS
-
-
-
- Initialize_MME
- Initialize MME
-
-
-
- Initialize_SPGW
- Initialize SPGW
-
-
-
- Terminate_HSS
- Terminate HSS
-
-
-
- Terminate_MME
- Terminate MME
-
-
-
- Terminate_SPGW
- Terminate SPGW
-
-
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1_not_run.xml b/ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1_not_run.xml
new file mode 100644
index 0000000000..9a96baac3f
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1_not_run.xml
@@ -0,0 +1,119 @@
+
+
+ test-20-tm1
+ Test-20MHz-TM1
+ tasks
+
+ 040101
+ 030124 040301 040521 040622 040621 040623 040662 040661 040663 040401 040201 030201
+
+
+
+
+ Initialize_eNB
+ Initialize eNB (TDD/Band40/20MHz/info)
+ -O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+
+
+
+ Terminate_eNB
+ Terminate eNB
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (20MHz - 20 sec)
+ -c 20
+ 25
+
+
+
+ Iperf
+ iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)
+ -u -b 13.5M -t 30 -i 1
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)
+ -u -b 13.5M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)
+ -u -b 13.5M -t 30 -i 1
+ 50
+ unbalanced
+
+
+
+ Iperf
+ iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ unbalanced
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_tracer.xml b/ci-scripts/xml_files/enb_usrp210_band40_tracer.xml
new file mode 100644
index 0000000000..dceb6be97a
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band40_tracer.xml
@@ -0,0 +1,65 @@
+
+
+ tracer-test
+ T-Tracer
+ duplicate
+
+ 040101
+ 030100 040300 040401 040201 030201
+
+
+
+
+ Initialize_eNB
+ Initialize eNB (TDD/Band40/5MHz) with T Tracer on
+ -O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf --T_stdout 0
+
+
+
+ Terminate_eNB
+ Terminate eNB
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach single UE
+ 1
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band7.xml b/ci-scripts/xml_files/enb_usrp210_band7.xml
deleted file mode 100644
index 0785ad815d..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band7.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-
-
-
- 010101
- 050101 060101 070101 040101
- 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
- 030111 040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201 030201
- 030121 040301 040521 040623 040624 040625 040626 040627 040662 040661 040663 040664 040401 040201 030201
- 050201 060201 070201
-
-
-
-
- Build_eNB
- Build eNB (USRP)
- -w USRP -c --eNB
-
-
-
- Initialize_eNB
- Initialize eNB (FDD/Band7/5MHz)
- -O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --codingw --fepw
-
-
-
- Initialize_eNB
- Initialize eNB (FDD/Band7/10MHz)
- -O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf --codingw --fepw
-
-
-
- Initialize_eNB
- Initialize eNB (FDD/Band7/20MHz)
- -O ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf --codingw --fepw
-
-
-
- Terminate_eNB
- Terminate eNB
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (5MHz - 20 sec)
- -c 20
- 5
-
-
-
- Ping
- ping (10MHz - 20 sec)
- -c 20
- 5
-
-
-
- Ping
- ping (20MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)
- -u -b 15M -t 30 -i 1
- 50
- balanced
-
-
-
- Iperf
- iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 15M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)
- -u -b 15M -t 30 -i 1
- 50
- unbalanced
-
-
-
- Iperf
- iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)
- -t 30 -i 1 -fm
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - DL/TCP)(30 sec)(balanced profile)
- -t 30 -i 1 -fm
- 50
- balanced
-
-
-
- Iperf
- iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)
- -u -b 9M -t 30 -i 1 -R
- 50
- balanced
-
-
-
- Iperf
- iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 9M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)
- -t 30 -i 1 -fm -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/TCP)(30 sec)(balanced profile)
- -t 30 -i 1 -fm -R
- 50
- balanced
-
-
-
- Iperf
- iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)
- -u -b 30M -t 30 -i 1
- 50
- balanced
-
-
-
- Iperf
- iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 30M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)
- -u -b 30M -t 30 -i 1
- 50
- unbalanced
-
-
-
- Iperf
- iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)
- -t 30 -i 1 -fm
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - DL/TCP)(30 sec)(balanced profile)
- -t 30 -i 1 -fm
- 50
- balanced
-
-
-
- Iperf
- iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- balanced
-
-
-
- Iperf
- iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)
- -t 30 -i 1 -fm -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - UL/TCP)(30 sec)(balanced profile)
- -t 30 -i 1 -fm -R
- 50
- balanced
-
-
-
- Iperf
- iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)
- -u -b 70M -t 30 -i 1
- 50
- balanced
-
-
-
- Iperf
- iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 70M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)
- -u -b 70M -t 30 -i 1
- 50
- unbalanced
-
-
-
- Iperf
- iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)
- -t 30 -i 1 -fm
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - DL/TCP)(30 sec)(balanced profile)
- -t 30 -i 1 -fm
- 50
- balanced
-
-
-
- Iperf
- iperf (20MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- balanced
-
-
-
- Iperf
- iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)
- -t 30 -i 1 -fm -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - UL/TCP)(30 sec)(balanced profile)
- -t 30 -i 1 -fm -R
- 50
- balanced
-
-
-
- Initialize_HSS
- Initialize HSS
-
-
-
- Initialize_MME
- Initialize MME
-
-
-
- Initialize_SPGW
- Initialize SPGW
-
-
-
- Terminate_HSS
- Terminate HSS
-
-
-
- Terminate_MME
- Terminate MME
-
-
-
- Terminate_SPGW
- Terminate SPGW
-
-
-
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_build.xml b/ci-scripts/xml_files/enb_usrp210_band7_build.xml
new file mode 100644
index 0000000000..31ee57e941
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band7_build.xml
@@ -0,0 +1,54 @@
+
+
+ build-tab
+ Build
+ wrench
+
+ 010101
+ 050101 060101 070101
+
+
+
+
+ Build_eNB
+ Build eNB (USRP)
+ -w USRP -c --eNB
+
+
+
+ Initialize_HSS
+ Initialize HSS
+
+
+
+ Initialize_MME
+ Initialize MME
+
+
+
+ Initialize_SPGW
+ Initialize SPGW
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_epc_closure.xml b/ci-scripts/xml_files/enb_usrp210_band7_epc_closure.xml
new file mode 100644
index 0000000000..07fb6951f8
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band7_epc_closure.xml
@@ -0,0 +1,47 @@
+
+
+ epc-closure
+ EPC-Closure
+ log-out
+
+ 050201 060201 070201
+
+
+
+
+ Terminate_HSS
+ Terminate HSS
+
+
+
+ Terminate_MME
+ Terminate MME
+
+
+
+ Terminate_SPGW
+ Terminate SPGW
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
new file mode 100644
index 0000000000..0057eaefa4
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
@@ -0,0 +1,143 @@
+
+
+ test-05-tm1
+ Test-05MHz-TM1
+ tasks
+
+ 040101
+ 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
+
+
+
+
+ Initialize_eNB
+ Initialize eNB (FDD/Band7/5MHz)
+ -O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
+
+
+
+ Terminate_eNB
+ Terminate eNB
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (5MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 15M -t 30 -i 1
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 15M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)
+ -u -b 15M -t 30 -i 1
+ 50
+ unbalanced
+
+
+
+ Iperf
+ iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - DL/TCP)(30 sec)(balanced profile)
+ -t 30 -i 1 -fm
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 9M -t 30 -i 1 -R
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 9M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - UL/TCP)(30 sec)(balanced profile)
+ -t 30 -i 1 -fm -R
+ 50
+ balanced
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
new file mode 100644
index 0000000000..92ec1efa6e
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
@@ -0,0 +1,143 @@
+
+
+ test-10-tm1
+ Test-10MHz-TM1
+ tasks
+
+ 040101
+ 030111 040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201 030201
+
+
+
+
+ Initialize_eNB
+ Initialize eNB (FDD/Band7/10MHz)
+ -O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
+
+
+
+ Terminate_eNB
+ Terminate eNB
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (10MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 30M -t 30 -i 1
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 30M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)
+ -u -b 30M -t 30 -i 1
+ 50
+ unbalanced
+
+
+
+ Iperf
+ iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (10MHz - DL/TCP)(30 sec)(balanced profile)
+ -t 30 -i 1 -fm
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 20M -t 30 -i 1 -R
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 20M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (10MHz - UL/TCP)(30 sec)(balanced profile)
+ -t 30 -i 1 -fm -R
+ 50
+ balanced
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml
new file mode 100644
index 0000000000..b6c441b19a
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml
@@ -0,0 +1,143 @@
+
+
+ test-20-tm1
+ Test-20MHz-TM1
+ tasks
+
+ 040101
+ 030121 040301 040521 040623 040624 040625 040662 040401 040201 030201
+
+ 040626 040627 040661 040663 040664
+
+
+ Initialize_eNB
+ Initialize eNB (FDD/Band7/20MHz)
+ -O ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
+
+
+
+ Terminate_eNB
+ Terminate eNB
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (20MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 70M -t 30 -i 1
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 70M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)
+ -u -b 70M -t 30 -i 1
+ 50
+ unbalanced
+
+
+
+ Iperf
+ iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - DL/TCP)(30 sec)(balanced profile)
+ -t 30 -i 1 -fm
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 12M -t 30 -i 1 -R
+ 50
+ balanced
+
+
+
+ Iperf
+ iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 17M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm -R
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - UL/TCP)(30 sec)(balanced profile)
+ -t 30 -i 1 -fm -R
+ 50
+ balanced
+
+
+
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_tracer.xml b/ci-scripts/xml_files/enb_usrp210_band7_tracer.xml
new file mode 100644
index 0000000000..4c74f52b0f
--- /dev/null
+++ b/ci-scripts/xml_files/enb_usrp210_band7_tracer.xml
@@ -0,0 +1,65 @@
+
+
+ tracer-test
+ T-Tracer
+ duplicate
+
+ 040101
+ 030100 040300 040401 040201 030201
+
+
+
+
+ Initialize_eNB
+ Initialize eNB (FDD/Band7/5MHz) with T Tracer on
+ -O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --T_stdout 0
+
+
+
+ Terminate_eNB
+ Terminate eNB
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach single UE
+ 1
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40.xml b/ci-scripts/xml_files/if4p5_usrp210_band40.xml
deleted file mode 100644
index 9c1b721bef..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band40.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
-
- 010101
- 050101 060101 070101 040101
- 030104 030105 040301 040501 040602 040401 040201 030201 030202
- 050201 060201 070201
-
-
-
-
-
-
- Build_eNB
- Build eNB (USRP -- Ethernet Fronthaul)
- -t ETHERNET -w USRP -c --eNB
-
-
-
- Initialize_eNB
- Initialize RRU (TDD/Band40)
- -O ci-scripts/conf_files/rru.tdd.band40.conf --codingw --fepw
- 0
-
-
-
- Initialize_eNB
- Initialize RCC (TDD/Band40/5MHz)
- -O ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf --codingw --fepw
- 1
-
-
-
- Initialize_eNB
- Initialize RRU (TDD/Band40)
- -O ci-scripts/conf_files/rru.tdd.band40.conf --codingw --fepw
- 0
-
-
-
- Initialize_eNB
- Initialize RCC (TDD/Band40/10MHz/info)
- -O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf --codingw --fepw
- 1
-
-
-
- Initialize_eNB
- Initialize RRU (TDD/Band40)
- -O ci-scripts/conf_files/rru.tdd.band40.conf --codingw --fepw
- 0
-
-
-
- Initialize_eNB
- Initialize RCC (TDD/Band40/20MHz/info)
- -O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf --codingw --fepw
- 1
-
-
-
- Terminate_eNB
- Terminate RCC
- 1
-
-
-
- Terminate_eNB
- Terminate RRU
- 0
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (5MHz - 20 sec)
- -c 20
- 25
-
-
-
- Ping
- ping (10MHz - 20 sec)
- -c 20
- 25
-
-
-
- Ping
- ping (20MHz - 20 sec)
- -c 20
- 25
-
-
-
- Iperf
- iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)
- -u -b 6.5M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)
- -u -b 13.5M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)
- -u -b 13.5M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
- -u -b 2M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
- -u -b 2M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
- -u -b 2M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Initialize_HSS
- Initialize HSS
-
-
-
- Initialize_MME
- Initialize MME
-
-
-
- Initialize_SPGW
- Initialize SPGW
-
-
-
- Terminate_HSS
- Terminate HSS
-
-
-
- Terminate_MME
- Terminate MME
-
-
-
- Terminate_SPGW
- Terminate SPGW
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_build.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_build.xml
new file mode 100644
index 0000000000..5bb7db5299
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_build.xml
@@ -0,0 +1,55 @@
+
+
+ build-tab
+ Build
+ wrench
+
+ 010101
+ 050101 060101 070101
+
+
+
+
+
+ Build_eNB
+ Build eNB (USRP -- Ethernet Fronthaul)
+ -t ETHERNET -w USRP -c --eNB
+
+
+
+ Initialize_HSS
+ Initialize HSS
+
+
+
+ Initialize_MME
+ Initialize MME
+
+
+
+ Initialize_SPGW
+ Initialize SPGW
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_epc_closure.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_epc_closure.xml
new file mode 100644
index 0000000000..c04a8b3cf4
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_epc_closure.xml
@@ -0,0 +1,48 @@
+
+
+ epc-closure
+ EPC-Closure
+ log-out
+
+ 050201 060201 070201
+
+
+
+
+
+ Terminate_HSS
+ Terminate HSS
+
+
+
+ Terminate_MME
+ Terminate MME
+
+
+
+ Terminate_SPGW
+ Terminate SPGW
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml
new file mode 100644
index 0000000000..1de23d05d6
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml
@@ -0,0 +1,103 @@
+
+
+ test-05
+ Test-05MHz
+ tasks
+
+ 040101
+ 030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
+
+
+
+
+
+ Initialize_eNB
+ Initialize RRU (TDD/Band40)
+ -O ci-scripts/conf_files/rru.tdd.band40.conf
+ 0
+
+
+
+ Initialize_eNB
+ Initialize RCC (TDD/Band40/5MHz)
+ -O ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+ 1
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 1
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 0
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (5MHz - 20 sec)
+ -c 20
+ 25
+
+
+
+ Iperf
+ iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)
+ -u -b 6.5M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml
new file mode 100644
index 0000000000..e68a893247
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml
@@ -0,0 +1,110 @@
+
+
+ test-10
+ Test-10MHz
+ tasks
+
+ 000001
+
+
+ 040101
+ 030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
+
+
+
+ IdleSleep
+ No Test in IF4.5 for FDD-10MHz
+ 10
+
+
+
+ Initialize_eNB
+ Initialize RRU (TDD/Band40)
+ -O ci-scripts/conf_files/rru.tdd.band40.conf
+ 0
+
+
+
+ Initialize_eNB
+ Initialize RCC (TDD/Band40/10MHz/info)
+ -O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+ 1
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 1
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 0
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (10MHz - 20 sec)
+ -c 20
+ 25
+
+
+
+ Iperf
+ iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)
+ -u -b 13.5M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz_not_run.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz_not_run.xml
new file mode 100644
index 0000000000..150515757f
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz_not_run.xml
@@ -0,0 +1,110 @@
+
+
+ test-20
+ Test-20MHz
+ tasks
+
+ 000001
+
+
+ 040101
+ 030124 030125 040301 040521 040622 040662 040401 040201 030201 030202
+
+
+
+ IdleSleep
+ No Test in IF4.5 for FDD-20MHz
+ 10
+
+
+
+ Initialize_eNB
+ Initialize RRU (TDD/Band40)
+ -O ci-scripts/conf_files/rru.tdd.band40.conf
+ 0
+
+
+
+ Initialize_eNB
+ Initialize RCC (TDD/Band40/20MHz/info)
+ -O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+ 1
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 1
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 0
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (20MHz - 20 sec)
+ -c 20
+ 25
+
+
+
+ Iperf
+ iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)
+ -u -b 13.5M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
+ -u -b 2M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7.xml b/ci-scripts/xml_files/if4p5_usrp210_band7.xml
deleted file mode 100644
index a3e5ecd72c..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band7.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-
- 010101
- 050101 060101 070101 040101
- 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
- 050201 060201 070201
-
-
-
-
-
-
- Build_eNB
- Build eNB (USRP -- Ethernet Fronthaul)
- -t ETHERNET -w USRP -c --eNB
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf --codingw --fepw
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/5MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf --codingw --fepw
- 0
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf --codingw --fepw
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/10MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf --codingw --fepw
- 0
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf --codingw --fepw
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/20MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf --codingw --fepw
- 0
-
-
-
- Terminate_eNB
- Terminate RCC
- 0
-
-
-
- Terminate_eNB
- Terminate RRU
- 1
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (5MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 15M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 9M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Ping
- ping (10MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 32M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Ping
- ping (20MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 70M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Initialize_HSS
- Initialize HSS
-
-
-
- Initialize_MME
- Initialize MME
-
-
-
- Initialize_SPGW
- Initialize SPGW
-
-
-
- Terminate_HSS
- Terminate HSS
-
-
-
- Terminate_MME
- Terminate MME
-
-
-
- Terminate_SPGW
- Terminate SPGW
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml
new file mode 100644
index 0000000000..a0be9253db
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml
@@ -0,0 +1,55 @@
+
+
+ build-tab
+ Build
+ wrench
+
+ 010101
+ 050101 060101 070101 040101
+
+
+
+
+
+ Build_eNB
+ Build eNB (USRP -- Ethernet Fronthaul)
+ -t ETHERNET -w USRP -c --eNB
+
+
+
+ Initialize_HSS
+ Initialize HSS
+
+
+
+ Initialize_MME
+ Initialize MME
+
+
+
+ Initialize_SPGW
+ Initialize SPGW
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_epc_closure.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_epc_closure.xml
new file mode 100644
index 0000000000..8587db959d
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_epc_closure.xml
@@ -0,0 +1,48 @@
+
+
+ epc-closure
+ EPC-Closure
+ log-out
+
+ 050201 060201 070201
+
+
+
+
+
+ Terminate_HSS
+ Terminate HSS
+
+
+
+ Terminate_MME
+ Terminate MME
+
+
+
+ Terminate_SPGW
+ Terminate SPGW
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
new file mode 100644
index 0000000000..b0501e9875
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
@@ -0,0 +1,103 @@
+
+
+ test-05
+ Test-05MHz
+ tasks
+
+ 040101
+ 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
+
+
+
+
+
+ Initialize_eNB
+ Initialize RRU (FDD/Band7)
+ -O ci-scripts/conf_files/rru.fdd.band7.conf
+ 1
+
+
+
+ Initialize_eNB
+ Initialize RCC (FDD/Band7/5MHz)
+ -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 1
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (5MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 15M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 9M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
new file mode 100644
index 0000000000..86bd6521ca
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
@@ -0,0 +1,110 @@
+
+
+ test-10
+ Test-10MHz
+ tasks
+
+ 000001
+
+
+ 040101
+ 030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
+
+
+
+ IdleSleep
+ No Test in IF4.5 for FDD-10MHz
+ 10
+
+
+
+ Initialize_eNB
+ Initialize RRU (FDD/Band7)
+ -O ci-scripts/conf_files/rru.fdd.band7.conf
+ 1
+
+
+
+ Initialize_eNB
+ Initialize RCC (FDD/Band7/10MHz)
+ -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 1
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (10MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 32M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (10MHz - UL/5Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 5M -t 30 -i 1 -R
+ 60
+ single-ue
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
new file mode 100644
index 0000000000..63997fc925
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
@@ -0,0 +1,110 @@
+
+
+ test-20
+ Test-20MHz
+ tasks
+
+ 000001
+
+
+ 040101
+ 030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
+
+
+
+ IdleSleep
+ No Test in IF4.5 for FDD-20MHz
+ 10
+
+
+
+ Initialize_eNB
+ Initialize RRU (FDD/Band7)
+ -O ci-scripts/conf_files/rru.fdd.band7.conf
+ 1
+
+
+
+ Initialize_eNB
+ Initialize RCC (FDD/Band7/20MHz)
+ -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 1
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (20MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (20MHz - DL/50Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 50M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - UL/10Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 10M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 668c3acc2e..253a78726a 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -21,7 +21,7 @@
# Author: laurent THOMAS, Lionel GAUTHIER
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
#############################################
# Base directories, compatible with legacy OAI building
@@ -167,13 +167,14 @@ endif()
#
set(CMAKE_C_FLAGS
- "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -fPIC ")
+ "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -fPIC")
# add autotools definitions that were maybe used!
+set(MKVER "'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'")
set(CMAKE_C_FLAGS
- "${CMAKE_C_FLAGS} -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP -D'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'"
+ "${CMAKE_C_FLAGS} -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP -D${MKVER}"
)
set(CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 -D'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'"
+ "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 -D${MKVER}"
)
add_definitions("-DASN_DISABLE_OER_SUPPORT")
@@ -252,6 +253,7 @@ add_boolean_option(UE_TIMING_TRACE False "Activate UE timing trace")
add_boolean_option(DISABLE_LOG_X False "Deactivate all LOG_* macros")
add_boolean_option(USRP_REC_PLAY False "Enable USRP record playback mode")
add_boolean_option(UE_NAS_USE_TUN False "Enable UE NAS TUN device instead of ue_ip.ko")
+add_boolean_option(NOS1 False "Allows to run without a EPC")
add_boolean_option(BASIC_SIMULATOR False "Has to be True when building the basic simulator, False otherwise")
add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
@@ -260,17 +262,17 @@ add_boolean_option(ENABLE_ITTI True "ITTI is internal messaging, should remain e
set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
if (${ENABLE_ITTI})
add_library(ITTI
- # add .h files if depend on (this one is generated)
${OCP_ITTI}/intertask_interface.cpp
${OPENAIR_DIR}/common/utils/backtrace.c
${OPENAIR_DIR}/common/utils/memory_pools.c
)
+add_dependencies(ITTI rrc_flag)
set(ITTI_LIB ITTI)
set(GTPU_need_ITTI ${OPENAIR3_DIR}/GTPV1-U/gtpv1u_eNB.c)
endif (${ENABLE_ITTI})
#############################
-# ASN.1 grammar C code generation & dependancies
+# ASN.1 grammar C code generation & dependencies
################################
# A difficulty: asn1c generates C code of a un-predictable list of files
# so, generate the c from asn1c once at cmake run time
@@ -278,8 +280,6 @@ endif (${ENABLE_ITTI})
# (so creating new asn.1 objects instead of modifying the object attributes)
# New C code source file, cmake must be re-run (instead of re-running make only)
#############
-# set(asn1c_call "${OPENAIR_CMAKE}/tools/generate_asn1")
-# set(fix_asn1c_call "${OPENAIR_CMAKE}/tools/fix_asn1")
set(asn1_generated_dir ${OPENAIR_BIN_DIR})
set(protoc_call "${OPENAIR_CMAKE}/tools/generate_protobuf")
@@ -290,7 +290,6 @@ set(protobuf_generated_dir ${OPENAIR_BIN_DIR})
add_list2_option(RRC_ASN1_VERSION "Rel15" "ASN.1 version of RRC interface" "Rel8" "Rel10" "Rel14" "CBA")
-Message("RRC_ASN1_VERSION is ${RRC_ASN1_VERSION}")
if (${RRC_ASN1_VERSION} STREQUAL "Rel8")
make_version(RRC_VERSION 8 6 0)
@@ -320,34 +319,25 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
endif (${RRC_ASN1_VERSION} STREQUAL "Rel8")
add_definitions(-DRRC_VERSION=${RRC_VERSION})
set (RRC_FULL_DIR ${asn1_generated_dir}/RRC_${RRC_ASN1_VERSION})
-message("calling asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}")
-execute_process(COMMAND mkdir -p ${RRC_FULL_DIR}
- COMMAND env asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
+
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${RRC_FULL_DIR}" "${RRC_GRAMMAR}"
+ RESULT_VARIABLE ret)
if (NOT ${ret} STREQUAL 0)
message(FATAL_ERROR "${ret}: error")
endif (NOT ${ret} STREQUAL 0)
-
file(GLOB rrc_source ${RRC_FULL_DIR}/*.c)
-file(GLOB rrc_h ${RRC_FULL_DIR}/*.h)
-set(rrc_h ${rrc_h} ${RRC_FULL_DIR}/asn_constant.h)
-set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
-add_library(RRC_LIB ${rrc_h} ${rrc_source}
- ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
- ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)
-include_directories ("${RRC_FULL_DIR}")
-
-# add the command to generate the source code
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-add_custom_command (
- OUTPUT ${RRC_FULL_DIR}/asn_constant.h
- COMMAND mkdir -p ${RRC_FULL_DIR}
- COMMAND env asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}
+add_custom_target (
+ rrc_flag ALL
+ ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${RRC_FULL_DIR}" "${RRC_GRAMMAR}"
DEPENDS ${RRC_GRAMMAR}
)
+add_library(RRC_LIB ${rrc_source}
+ ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
+ ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)
+add_dependencies(RRC_LIB rrc_flag)
+include_directories ("${RRC_FULL_DIR}")
#NR RRC
######
@@ -361,34 +351,26 @@ endif (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
add_definitions(-DNR_RRC_VERSION=${NR_RRC_VERSION})
set (NR_RRC_FULL_DIR ${asn1_generated_dir}/${NR_RRC_ASN1_VERSION})
-message("calling ASN1C_PREFIX=NR_ asn1c -pdu=all -fcompound-names -findirect-choice -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR}")
-execute_process(COMMAND mkdir -p ${NR_RRC_FULL_DIR}
- COMMAND env "ASN1C_PREFIX=NR_" asn1c -fcompound-names -findirect-choice -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
-
-#if (NOT ${ret} STREQUAL 0)
-# message(FATAL_ERROR "${ret}: error")
-#endif (NOT ${ret} STREQUAL 0)
-
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${NR_RRC_FULL_DIR}" "${NR_RRC_GRAMMAR}" "NR_" "-findirect-choice"
+ RESULT_VARIABLE ret)
+if (NOT ${ret} STREQUAL 0)
+ message(FATAL_ERROR "${ret}: error")
+endif ()
file(GLOB nr_rrc_source ${NR_RRC_FULL_DIR}/*.c)
file(GLOB nr_rrc_h ${NR_RRC_FULL_DIR}/*.h)
-set(nr_rrc_h ${nr_rrc_h} ${NR_RRC_FULL_DIR}/NR_asn_constant.h)
-#set_source_files_properties(${nr_rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
-add_library(NR_RRC_LIB
- ${nr_rrc_h}
- ${nr_rrc_source}
- ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c)
+add_custom_target (
+ nr_rrc_flag ALL
+ ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${NR_RRC_FULL_DIR}" "${NR_RRC_GRAMMAR}" "NR_" "-findirect-choice"
+ DEPENDS ${NR_RRC_GRAMMAR}
+ )
+
+add_library(NR_RRC_LIB ${nr_rrc_h} ${nr_rrc_source}
+ ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c
+ )
+add_dependencies(NR_RRC_LIB nr_rrc_flag)
include_directories ("${NR_RRC_FULL_DIR}")
-# add the command to generate the source code
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-
-add_custom_command (OUTPUT ${NR_RRC_FULL_DIR}/NR_asn_constant.h
- COMMAND mkdir -p ${NR_RRC_FULL_DIR}
- DEPENDS ${NR_RRC_GRAMMAR}
- )
# S1AP
# Same limitation as described in RRC: unknown generated file list
@@ -425,30 +407,26 @@ endif(${S1AP_RELEASE} STREQUAL "R8")
add_definitions(-DS1AP_VERSION=${S1AP_VERSION})
set(S1AP_ASN_DIR ${S1AP_DIR}/MESSAGES/ASN1/${S1AP_RELEASE})
set(S1AP_C_DIR ${asn1_generated_dir}/S1AP_${S1AP_RELEASE})
-message("calling ASN1C_PREFIX=S1AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}")
-execute_process(COMMAND mkdir -p ${S1AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
+
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${S1AP_C_DIR}" "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "S1AP_" -fno-include-deps
+ RESULT_VARIABLE ret)
if (NOT ${ret} STREQUAL 0)
message(FATAL_ERROR "${ret}: error")
endif (NOT ${ret} STREQUAL 0)
file(GLOB S1AP_source ${S1AP_C_DIR}/*.c)
-file(GLOB s1ap_h ${S1AP_C_DIR}/*.h)
-set(s1ap_h ${s1ap_h})
-
-add_custom_command (
- OUTPUT ${S1AP_C_DIR}/S1AP_asn_constant.h
- COMMAND mkdir -p ${S1AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
- DEPENDS ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
+add_custom_target (
+ s1ap_flag ALL
+ ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${S1AP_C_DIR}" "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "S1AP_" -fno-include-deps
+ DEPENDS "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}"
)
+
add_library(S1AP_LIB
${S1AP_source}
${S1AP_DIR}/s1ap_common.c
)
+add_dependencies(S1AP_LIB rrc_flag s1ap_flag)
include_directories ("${S1AP_C_DIR}")
include_directories ("${S1AP_DIR}")
@@ -467,6 +445,7 @@ add_library(S1AP_ENB
${S1AP_DIR}/s1ap_eNB_trace.c
${S1AP_DIR}/s1ap_eNB_ue_context.c
)
+add_dependencies(S1AP_ENB rrc_flag s1ap_flag)
#X2AP
# Same limitation as described in RRC/S1AP: unknown generated file list
@@ -494,24 +473,19 @@ endif(${X2AP_RELEASE} STREQUAL "R8")
add_definitions(-DX2AP_VERSION=${X2AP_VERSION})
set(X2AP_ASN_DIR ${X2AP_DIR}/MESSAGES/ASN1/${X2AP_RELEASE})
set(X2AP_C_DIR ${asn1_generated_dir}/X2AP_${X2AP_RELEASE})
-message("calling ASN1C_PREFIX=X2AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}")
-execute_process(COMMAND mkdir -p ${X2AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=X2AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
+
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${X2AP_C_DIR}" "${X2AP_ASN_DIR}/${X2AP_ASN_FILES}" "X2AP_" -fno-include-deps
+ RESULT_VARIABLE ret)
if (NOT ${ret} STREQUAL 0)
message(FATAL_ERROR "${ret}: error")
endif (NOT ${ret} STREQUAL 0)
+
file(GLOB X2AP_source ${X2AP_C_DIR}/*.c)
-file(GLOB x2ap_h ${X2AP_C_DIR}/*.h)
-set(x2ap_h ${x2ap_h})
-
-add_custom_command (
- OUTPUT ${X2AP_C_DIR}/X2AP_asn_constant.h
- COMMAND mkdir -p ${X2AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=X2AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
+add_custom_target (
+ x2_flag ALL
+ COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${X2AP_C_DIR}" "${X2AP_ASN_DIR}/${X2AP_ASN_FILES}" "X2AP_" -fno-include-deps
DEPENDS ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
)
@@ -519,6 +493,7 @@ add_library(X2AP_LIB
${X2AP_source}
${X2AP_DIR}/x2ap_common.c
)
+add_dependencies(X2AP_LIB rrc_flag x2_flag)
include_directories ("${X2AP_C_DIR}")
include_directories ("${X2AP_DIR}")
@@ -532,6 +507,7 @@ add_library(X2AP_ENB
${X2AP_DIR}/x2ap_eNB_management_procedures.c
${X2AP_DIR}/x2ap_eNB_generate_messages.c
)
+add_dependencies(X2AP_ENB rrc_flag x2_flag)
# Hardware dependant options
###################################
@@ -539,6 +515,10 @@ add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4
add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")
add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR")
+if (NOT ${RF_BOARD} STREQUAL "None")
+ add_definitions(-DMANAGED_RF=1)
+endif()
+
add_list2_option(TRANSP_PRO "None" "Transport protocol type" "None" "ETHERNET")
#NOKIA config enhancement
@@ -639,6 +619,8 @@ set(HWLIB_TCP_BRIDGE_OAI_SOURCE
add_library(tcp_bridge_oai MODULE ${HWLIB_TCP_BRIDGE_OAI_SOURCE} )
set_target_properties(tcp_bridge_oai PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+add_library(rfsimulator MODULE ${OPENAIR_TARGETS}/ARCH/rfsimulator/simulator.c)
+
##########################################################
include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
@@ -661,7 +643,6 @@ add_boolean_option(NAS_NETLINK False "useless ??? Must be True to compile nasmes
add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????")
add_boolean_option(USE_MME False "this flag is used only one time in lte-softmodem.c")
-add_list_string_option(PACKAGE_NAME "NotDefined" "As per attribute name")
add_boolean_option(MESSAGE_CHART_GENERATOR False "For generating sequence diagrams")
add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchanges in sequence diagrams")
@@ -669,11 +650,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
add_boolean_option(UE_EXPANSION False "enable UE_EXPANSION with max 256 UE")
add_boolean_option(PHY_TX_THREAD False "enable UE_EXPANSION with max 256 UE")
add_boolean_option(PRE_SCD_THREAD False "enable UE_EXPANSION with max 256 UE")
-
-########################
-# Include order
-##########################
-add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
+add_boolean_option(UESIM_EXPANSION False "enable UESIM_EXPANSION with max 256 UE")
##########################
# SCHEDULING/REAL-TIME/PERF options
@@ -694,7 +671,7 @@ add_boolean_option(EXMIMO_IOT True "????")
add_boolean_option(LOCALIZATION False "???")
add_integer_option(MAX_NUM_CCs 1 "????")
add_boolean_option(MU_RECEIVER False "????")
-add_boolean_option(PHYSIM True "for L1 simulators (dlsim, ulsim, ...)")
+add_boolean_option(PHYSIM False "for L1 simulators (dlsim, ulsim, ...)")
add_boolean_option(PHY_CONTEXT True "not clear: must remain False for dlsim")
add_boolean_option(PHY_EMUL False "not clear: must remain False for dlsim")
add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator")
@@ -776,19 +753,13 @@ include_directories("${OPENAIR_BIN_DIR}")
#include_directories("${include_dirs_all}")
# Legacy exact order
-if(ENB_MODE)
- include_directories("${OPENAIR2_DIR}/COMMON")
- include_directories("${OPENAIR2_DIR}/UTIL")
- include_directories("${OPENAIR2_DIR}/UTIL/LOG")
- include_directories("${OPENAIR3_DIR}/COMMON")
- include_directories("${OPENAIR3_DIR}/UTILS")
-else()
- include_directories("${OPENAIR3_DIR}/COMMON")
- include_directories("${OPENAIR3_DIR}/UTILS")
- include_directories("${OPENAIR2_DIR}/COMMON")
- include_directories("${OPENAIR2_DIR}/UTIL")
- include_directories("${OPENAIR2_DIR}/UTIL/LOG")
-endif()
+
+include_directories("${OPENAIR2_DIR}/COMMON")
+include_directories("${OPENAIR2_DIR}/UTIL")
+include_directories("${OPENAIR2_DIR}/UTIL/LOG")
+include_directories("${OPENAIR3_DIR}/COMMON")
+include_directories("${OPENAIR3_DIR}/UTILS")
+
include_directories("${NFAPI_DIR}/nfapi/public_inc")
include_directories("${NFAPI_DIR}/common/public_inc")
include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -927,6 +898,7 @@ add_library(FLEXRAN_AGENT
${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c
)
+add_dependencies(FLEXRAN_AGENT rrc_flag)
set(FLEXRAN_AGENT_LIB FLEXRAN_AGENT)
#include_directories(${OPENAIR2_DIR}/ENB_APP)
@@ -992,6 +964,7 @@ set(UTIL_SRC
# ${OPENAIR2_DIR}/UTIL/OTG/otg_rx.c
)
add_library(UTIL ${UTIL_SRC})
+add_dependencies(UTIL rrc_flag)
#set(OMG_SUMO_SRC
# ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
@@ -1031,7 +1004,7 @@ set(SCHED_SRC
${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
)
add_library(SCHED_LIB ${SCHED_SRC})
-
+add_dependencies(SCHED_LIB rrc_flag)
set(SCHED_NR_SRC
${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_common.c
@@ -1045,6 +1018,7 @@ set(SCHED_SRC_RU
${OPENAIR1_DIR}/SCHED/prach_procedures.c
)
add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
+add_dependencies(SCHED_RU_LIB rrc_flag)
set(SCHED_SRC_UE
${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -1054,7 +1028,7 @@ set(SCHED_SRC_UE
${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
)
add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-
+add_dependencies(SCHED_UE_LIB rrc_flag)
set(SCHED_SRC_NR_UE
${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_common.c
@@ -1116,6 +1090,7 @@ set(NFAPI_USER_SRC
${NFAPI_USER_DIR}/nfapi_vnf.c
)
add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
+add_dependencies(NFAPI_USER_LIB rrc_flag)
include_directories(${NFAPI_USER_DIR})
# Layer 1
@@ -1158,11 +1133,7 @@ set(PHY_LDPCSRC
)
add_library(coding MODULE ${PHY_TURBOSRC} )
-
set(PHY_SRC_COMMON
- # depend on code generation from asn1c
- ${RRC_FULL_DIR}/asn_constant.h
- # actual source
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
# ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
@@ -1216,7 +1187,6 @@ set(PHY_SRC_COMMON
)
set(PHY_SRC
- # actual source
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
@@ -1244,7 +1214,6 @@ set(PHY_SRC
)
set(PHY_SRC_RU
- # actual source
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
@@ -1259,7 +1228,6 @@ set(PHY_SRC_RU
)
set(PHY_SRC_UE
- # actual source
${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/sss_ue.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
@@ -1301,9 +1269,6 @@ set(PHY_SRC_UE
)
set(PHY_NR_SRC
- # depend on code generation from asn1c
- ${RRC_FULL_DIR}/asn_constant.h
- # actual source
${OPENAIR1_DIR}/PHY/INIT/nr_init.c
${OPENAIR1_DIR}/PHY/INIT/nr_parms.c
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_pss.c
@@ -1314,6 +1279,7 @@ set(PHY_SRC_UE
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+ ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
@@ -1335,9 +1301,6 @@ set(PHY_SRC_UE
)
set(PHY_NR_UE_SRC
- # depend on code generation from asn1c
- ${RRC_FULL_DIR}/asn_constant.h
- # actual source
${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
${OPENAIR1_DIR}/PHY/INIT/nr_parms.c
${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pss_nr.c
@@ -1347,6 +1310,7 @@ set(PHY_SRC_UE
${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+ ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
@@ -1396,11 +1360,15 @@ if (${COMPILATION_AVX2} STREQUAL "True")
endif ()
add_library(PHY_COMMON ${PHY_SRC_COMMON})
+add_dependencies(PHY_COMMON rrc_flag)
add_library(PHY ${PHY_SRC})
+add_dependencies(PHY rrc_flag)
add_library(PHY_UE ${PHY_SRC_UE})
+add_dependencies(PHY_UE rrc_flag)
add_library(PHY_NR ${PHY_NR_SRC})
add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
add_library(PHY_RU ${PHY_SRC_RU})
+add_dependencies(PHY_RU rrc_flag)
#Library for mex functions
#########################3
@@ -1614,6 +1582,7 @@ add_library(L2
${MAC_SRC}
${ENB_APP_SRC}
)
+add_dependencies(L2 rrc_flag s1ap_flag x2_flag)
add_library(MAC_NR
${MAC_NR_SRC}
@@ -1628,52 +1597,26 @@ add_library(L2_NR
${MAC_NR_SRC}
${GNB_APP_SRC}
)
+add_dependencies(S1AP_LIB nr_rrc_flag s1ap_flag)
add_library(L2_UE
${L2_SRC_UE}
${MAC_SRC_UE}
- #${MAC_NR_SRC_UE}
)
+if (NOT ${NOS1})
+target_compile_definitions(L2_UE PUBLIC -DPDCP_USE_NETLINK)
+endif()
+
+add_dependencies(L2_UE rrc_flag s1ap_flag x2_flag)
add_library( NR_L2_UE
- #${L2_SRC_UE}
${NR_L2_SRC_UE}
${MAC_NR_SRC_UE}
- #${MAC_SRC_UE}
-)
-
-set ( NR_LTE_UE_REUSE_SRC
- ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
- ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
- #${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
- ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
- #${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch_common.c
-
- #${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_cell_spec.c
- #${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
- #${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach_common.c
-# ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
- ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c
- ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
- ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
- #${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich_common.c
- ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
-
-# ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
-# ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
- ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
- ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c
- ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_gold.c
- ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
- ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
- ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
- #${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
- #${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
-)
-
-add_library( NR_LTE_UE_REUSE_LIB
- ${NR_LTE_UE_REUSE_SRC}
-)
+ )
+
+add_library( MAC_NR_COMMON
+ ${OPENAIR2_DIR}/LAYER2/NR_MAC_gNB/nr_mac_common.c
+ )
include_directories("${OPENAIR2_DIR}/NR_UE_PHY_INTERFACE")
include_directories("${OPENAIR2_DIR}/LAYER2/NR_MAC_UE")
@@ -1702,6 +1645,7 @@ set (GTPV1U_SRC
${GTPV1U_DIR}/gtpv1u_teid_pool.c
)
add_library(GTPV1U ${GTPV1U_SRC})
+add_dependencies(GTPV1U rrc_flag)
set(SCTP_SRC
${OPENAIR3_DIR}/SCTP/sctp_common.c
@@ -1709,8 +1653,10 @@ set(SCTP_SRC
${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c
)
add_library(SCTP_CLIENT ${SCTP_SRC})
+add_dependencies(SCTP_CLIENT rrc_flag)
add_library(UDP ${OPENAIR3_DIR}/UDP/udp_eNB_task.c)
+add_dependencies(UDP rrc_flag)
set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
@@ -1959,6 +1905,7 @@ if(NAS_UE)
${libnas_ue_esm_OBJS}
${libnas_ue_esm_sap_OBJS}
)
+ add_dependencies(LIB_NAS_UE rrc_flag)
set(NAS_UE_LIB LIB_NAS_UE)
include_directories(${NAS_SRC}UE)
@@ -2219,8 +2166,6 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
###################################################
add_executable(lte-softmodem
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-enb.c
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
@@ -2242,6 +2187,7 @@ add_executable(lte-softmodem
${CONFIG_SOURCES}
${SHLIB_LOADER_SOURCES}
)
+add_dependencies(lte-softmodem rrc_flag s1ap_flag x2_flag)
target_link_libraries (lte-softmodem
-Wl,--start-group
@@ -2258,8 +2204,6 @@ target_link_libraries (lte-softmodem ${T_LIB})
# lte-softmodem-nos1 is both eNB and UE implementation
###################################################
add_executable(lte-softmodem-nos1
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-enb.c
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
@@ -2296,8 +2240,6 @@ target_link_libraries (lte-softmodem-nos1 ${T_LIB})
#######################################
add_executable(lte-uesoftmodem
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-ue.c
${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
@@ -2319,6 +2261,10 @@ add_executable(lte-uesoftmodem
${SHLIB_LOADER_SOURCES}
)
+add_dependencies(lte-uesoftmodem rrc_flag s1ap_flag x2_flag)
+if (NOT ${NOS1})
+ target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
+endif()
target_link_libraries (lte-uesoftmodem
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
@@ -2334,8 +2280,6 @@ target_link_libraries (lte-uesoftmodem ${T_LIB})
# lte-uesoftmodem-nos1 is UE implementation
###################################################
add_executable(lte-uesoftmodem-nos1
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-ue.c
${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
@@ -2358,6 +2302,7 @@ add_executable(lte-uesoftmodem-nos1
${SHLIB_LOADER_SOURCES}
)
+add_dependencies(lte-uesoftmodem-nos1 rrc_flag s1ap_flag x2_flag)
target_link_libraries (lte-uesoftmodem-nos1
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU ${RAL_LIB} ${ITTI_LIB}
@@ -2400,7 +2345,7 @@ target_link_libraries (nr-softmodem
-Wl,--start-group
UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_RU LFDS GTPV1U SECU_CN SECU_OSA
${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB}
- RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB L2 L2_NR
+ RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB L2 L2_NR MAC_NR_COMMON
NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
-Wl,--end-group z dl)
@@ -2441,7 +2386,7 @@ target_link_libraries (nr-softmodem-nos1
-Wl,--start-group
UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_RU LFDS GTPV1U SECU_CN SECU_OSA
${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${MIH_LIB}
- RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB L2 L2_NR
+ RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB L2 L2_NR MAC_NR_COMMON
NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
-Wl,--end-group z dl)
@@ -2457,11 +2402,10 @@ add_executable(nr-uesoftmodem
${rrc_h}
${s1ap_h}
# ${OPENAIR_BIN_DIR}/messages_xml.h
- ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
- ${OPENAIR_TARGETS}/RT/USER/nr-ue.c
- ${OPENAIR_TARGETS}/RT/USER/nr-uesoftmodem.c
+ ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
+ ${OPENAIR_DIR}/executables//nr-uesoftmodem.c
+ ${OPENAIR_DIR}/executables/nr-ue.c
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-# ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
@@ -2476,7 +2420,7 @@ add_executable(nr-uesoftmodem
target_link_libraries (nr-uesoftmodem
-Wl,--start-group
- RRC_LIB NR_RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB PHY_COMMON PHY_NR_UE PHY_RU LFDS NR_L2_UE #NR_LTE_UE_REUSE_LIB
+ RRC_LIB NR_RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB PHY_COMMON PHY_NR_UE PHY_RU LFDS NR_L2_UE MAC_NR_COMMON
${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES}
-Wl,--end-group z dl)
@@ -2510,7 +2454,7 @@ add_executable(nr-uesoftmodem-nos1
target_link_libraries (nr-uesoftmodem-nos1
-Wl,--start-group
- RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB PHY_COMMON PHY_NR_UE PHY_UE PHY_RU LFDS NR_L2_UE
+ RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB PHY_COMMON PHY_NR_UE PHY_UE PHY_RU LFDS NR_L2_UE MAC_NR_COMMON
${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES}
-Wl,--end-group z dl)
@@ -2561,36 +2505,56 @@ target_link_libraries (dlsim_tm4
pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB}
)
-add_executable(polartest ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c)
+add_executable(polartest
+ ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c)
target_link_libraries(polartest SIMU PHY PHY_NR PHY_COMMON m ${ATLAS_LIBRARIES})
+
add_executable(smallblocktest ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/smallblocktest.c)
target_link_libraries(smallblocktest SIMU PHY PHY_NR PHY_COMMON m ${ATLAS_LIBRARIES})
-add_executable(ldpctest ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c)
+add_executable(ldpctest
+ ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c)
target_link_libraries(ldpctest SIMU PHY PHY_NR m ${ATLAS_LIBRARIES})
-add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c ${T_SOURCE})
+add_executable(nr_dlschsim
+ ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
+ ${T_SOURCE})
target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
-add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURCE})
+add_executable(nr_pbchsim
+ ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
+ ${T_SOURCE})
target_link_libraries(nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
-add_executable(nr_dlsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c ${T_SOURCE})
-target_link_libraries(nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR RRC_LIB NR_RRC_LIB CONFIG_LIB L2_NR -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+add_executable(nr_dlsim
+ ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
+ ${T_SOURCE})
+target_link_libraries(nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_NR -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+
+add_executable(nr_ulschsim
+ ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
+ ${T_SOURCE})
+target_link_libraries(nr_ulschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
-
+
add_executable(${myExe}
${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
${XFORMS_SOURCE}
${T_SOURCE}
${CONFIG_SOURCES}
${SHLIB_LOADER_SOURCES}
)
target_link_libraries (${myExe}
-
-Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY PHY_UE PHY_RU LFDS ${ITTI_LIB} LFDS7 -Wl,--end-group
pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB} dl
)
@@ -2660,7 +2624,7 @@ if (${T_TRACER})
#all "add_executable" definitions (except tests, rb_tool, updatefw)
lte-softmodem lte-softmodem-nos1 lte-uesoftmodem lte-uesoftmodem-nos1
nr-softmodem nr-softmodem-nos1 nr-uesoftmodem nr-uesoftmodem-nos1
- dlsim_tm4 dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
+ dlsim_tm4 nr_dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
pdcchsim pucchsim prachsim syncsim ulsim
ldpctest polartest
#all "add_library" definitions
@@ -2710,7 +2674,9 @@ L2
L2_NR
L2_UE
NR_L2_UE
-NR_LTE_UE_REUSE_LIB
+MAC_NR_COMMON
+MAC_NR
+MAC_UE_NR
CN_UTILS
GTPV1U
SCTP_CLIENT
@@ -2776,7 +2742,7 @@ endfunction(make_driver name dir src)
# nashmesh module
################
list(APPEND nasmesh_src device.c common.c ioctl.c classifier.c tool.c mesh.c)
-set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK")
+set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK -D${MKVER}")
# legacy Makefile was using NAS_NETLINK flag, but other drivers the hereafter flag
# so, this cmake use OAI_NW_DRIVER_USE_NETLINK everywhere
if (OAI_NW_DRIVER_USE_NETLINK)
diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index aa1db28d75..c0f8eac447 100644
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -1057,8 +1057,8 @@
(Test2: PBCH and synchronization, 106PBR),
(Test3: PBCH-only, 217 PRB),
(Test4: PBCH and synchronization, 217 RPB),
- (Test5: PBCH-only, 217 PRB),
- (Test6: PBCH and synchronization, 217 PRB)
+ (Test5: PBCH-only, 273 PRB),
+ (Test6: PBCH and synchronization, 273 PRB)
$OPENAIR_DIR/cmake_targets/build_oai
--phy_simulators -c
@@ -1071,24 +1071,59 @@
-s0 -S1 -n10 -I -R217
-s0 -S1 -n1000 -R273
-s0 -S1 -n10 -I -R273
- nr_pbchsim.test1 nr_pbchsim.test2
+ nr_pbchsim.test1 nr_pbchsim.test2 nr_pbchsim.test3 nr_pbchsim.test4 nr_pbchsim.test5 nr_pbchsim.test6
PBCH test OK
segmentation fault|assertion|exiting|fatal
3
-
+
+ execution
+ nr_dlsim Test cases. (Test1: 106 PRB),
+ (Test2: 217 PRB),
+ (Test3: 273 PRB)
+
+ $OPENAIR_DIR/cmake_targets/build_oai
+ --phy_simulators -c
+ $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
+
+ $OPENAIR_DIR/targets/bin/nr_dlsim.Rel15
+ -n100 -R106
+ -n100 -R217
+ -n100 -R273
+ nr_dlsim.test1 nr_dlsim.test2 nr_dlsim.test3
+ PDCCH test OK
+ segmentation fault|assertion|exiting|fatal
+ 3
+
+
+
+ execution
+ nr_dlschsim Test cases. (Test1: 106 PRB),
+ (Test2: 217 PRB),
+ (Test3: 273 PRB)
+
+ $OPENAIR_DIR/cmake_targets/build_oai
+ --phy_simulators -c
+ $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
+
+ $OPENAIR_DIR/targets/bin/nr_dlschsim.Rel15
+ -R 106 -m9 -s13 -n100
+ -R 217 -m15 -s15 -n100
+ -R 273 -m19 -s20 -n100
+ nr_dlschsim.test1 nr_dlschsim.test2 nr_dlschsim.test3
+ PDSCH test OK
+ segmentation fault|assertion|exiting|fatal
+ 3
+
+
+
execution
shortblocktest Test cases. (Test1: 3 bits),
(Test2: 6 bits)
(Test3: 7 bits)
(Test4: 11 bits)
-
- $OPENAIR_DIR/cmake_targets/build_oai
- --phy_simulators -c
- $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
-
$OPENAIR_DIR/targets/bin/smallblocktest.Rel15
-l 3
-l 6
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 69aafbc41b..4bfa734709 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -43,10 +43,10 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
MSC_GEN=0
XFORMS="True"
UE_EXPANSION="False"
+UESIM_EXPANSION="False"
PRINT_STATS="False"
VCD_TIMING="False"
-DEADLINE_SCHEDULER_FLAG_USER="False"
-FORCE_DEADLINE_SCHEDULER_FLAG_USER=""
+DEADLINE_SCHEDULER_FLAG_USER=""
CPU_AFFINITY_FLAG_USER="False" #Only valid when lowlatecy flag is set to False
REL="Rel15"
NR_REL="NR_Rel15"
@@ -78,7 +78,7 @@ trap handle_ctrl_c INT
function print_help() {
echo_info "
This program installs OpenAirInterface Software
-You should have ubuntu 14.xx, updated, and the Linux kernel >= 3.14
+You should have ubuntu 16.xx or 18.04 updated
Options
-h
This help
@@ -116,7 +116,7 @@ Options
Rel8 limits the implementation to 3GPP Release 8 version
Rel10 limits the implementation to 3GPP Release 10 version
-w | --hardware
- EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, ADRV9371_ZC706, None (Default)
+ EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, ADRV9371_ZC706, SIMU, None (Default)
Adds this RF board support (in external packages installation and in compilation)
-t | --transport protocol
ETHERNET , None
@@ -175,6 +175,9 @@ Options
--basic-simulator
Generates a basic [1 UE + 1 eNB + no channel] simulator.
See targets/ARCH/tcp_bridge/README.tcp_bridge_oai for documentation.
+--rfsimulator
+ Generate virtual RF driver
+ to use it, set the environement variable RFSIMULATOR to \"enb\" in the eNB and to the eNB IP address in the UEs
Usage (first build):
NI/ETTUS B201 + COTS UE : ./build_oai -I --eNB -x --install-system-files -w USRP
Usage (Regular):
@@ -250,7 +253,7 @@ function main() {
-w | --hardware)
HW="$2" #"${i#*=}"
# Use OAI_USRP as the key word USRP is used inside UHD driver
- if [ "$HW" != "BLADERF" -a "$HW" != "USRP" -a "$HW" != "LMSSDR" -a "$HW" != "None" -a "$HW" != "EXMIMO" -a "$HW" != "ADRV9371_ZC706" ] ; then
+ if [ "$HW" != "BLADERF" -a "$HW" != "USRP" -a "$HW" != "LMSSDR" -a "$HW" != "None" -a "$HW" != "EXMIMO" -a "$HW" != "ADRV9371_ZC706" -a "$HW" != "SIMU" ] ; then
echo_fatal "Unknown HW type $HW will exit..."
else
if [ "$HW" == "USRP" ] ; then
@@ -265,6 +268,9 @@ function main() {
if [ "$HW" == "LMSSDR" ] ; then
HW="OAI_LMSSDR"
fi
+ if [ "$HW" == "SIMU" ] ; then
+ HW="OAI_SIMU"
+ fi
echo_info "Setting hardware to: $HW"
fi
shift 2;;
@@ -331,13 +337,13 @@ function main() {
BUILD_DOXYGEN=1
echo_info "Will build doxygen support"
shift;;
- --disable-deadline)
- FORCE_DEADLINE_SCHEDULER_FLAG_USER="False"
- echo_info "Disabling the usage of deadline scheduler"
- shift 1;;
- --enable-deadline)
- FORCE_DEADLINE_SCHEDULER_FLAG_USER="True"
- echo_info "Enabling the usage of deadline scheduler"
+ --disable-deadline)
+ DEADLINE_SCHEDULER_FLAG_USER="False"
+ echo_info "Disabling the usage of deadline scheduler"
+ shift 1;;
+ --enable-deadline)
+ DEADLINE_SCHEDULER_FLAG_USER="True"
+ echo_info "Enabling the usage of deadline scheduler"
shift 1;;
--enable-cpu-affinity)
CPU_AFFINITY_FLAG_USER="True"
@@ -400,7 +406,11 @@ function main() {
BASIC_SIMULATOR=1
echo_info "Compiling the basic simulator"
shift 1;;
- -h | --help)
+ --rfsimulator)
+ RFSIMULATOR=true
+ echo_info "Compiling the RF simulator"
+ shift 1;;
+ -h | --help)
print_help
exit 1;;
*)
@@ -441,33 +451,18 @@ function main() {
fi
fi
- echo_info "RF HW set to $HW"
- #Now we set flags to enable deadline scheduler settings
- #By default: USRP: disable,
- #By default: BLADERF: enable,
- #By default: EXMIMO: enable
- if [ "$FORCE_DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
- if [ "$HW" = "EXMIMO" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="True"
- elif [ "$HW" = "ETHERNET" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_USRP" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_ADRV9371_ZC706" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_BLADERF" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_LMSSDR" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "None" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- else
- echo_error "Unknown HW type $HW. Exiting now..."
- exit
- fi
- else
- DEADLINE_SCHEDULER_FLAG_USER=$FORCE_DEADLINE_SCHEDULER_FLAG_USER
- fi
+ echo_info "RF HW set to $HW"
+ # If the user doesn't specify the Linux scheduler to use, we set a value
+ if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
+ case "$HW" in
+ "EXMIMO")
+ DEADLINE_SCHEDULER_FLAG_USER="True"
+ ;;
+ *)
+ DEADLINE_SCHEDULER_FLAG_USER="False"
+ ;;
+ esac
+ fi
#Disable CPU Affinity for deadline scheduler
if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then
@@ -696,7 +691,7 @@ function main() {
echo_info "Compiling unitary tests simulators"
# TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
#simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
- simlist="dlsim ulsim polartest ldpctest smallblocktest nr_pbchsim nr_dlschsim nr_dlsim"
+ simlist="dlsim ulsim polartest ldpctest smallblocktest nr_pbchsim nr_dlschsim nr_dlsim nr_ulschsim"
for f in $simlist ; do
compilations \
phy_simulators $f \
diff --git a/cmake_targets/tools/make_asn1c_includes.sh b/cmake_targets/tools/make_asn1c_includes.sh
new file mode 100755
index 0000000000..bd4254c938
--- /dev/null
+++ b/cmake_targets/tools/make_asn1c_includes.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+GENERATED_FULL_DIR=$1
+shift
+ASN1_SOURCE_DIR=$1
+shift
+export ASN1C_PREFIX=$1
+shift
+options=$*
+done_flag="$GENERATED_FULL_DIR"/done
+if [ "$done_flag" -ot $ASN1_SOURCE_DIR ] ; then
+ rm -f "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.c "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.h
+ mkdir -p "$GENERATED_FULL_DIR"
+ asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example $options -D $GENERATED_FULL_DIR $ASN1_SOURCE_DIR |& egrep -v "^Copied|^Compiled" | sort -u
+fi
+touch $done_flag
diff --git a/common/utils/backtrace.h b/common/utils/backtrace.h
index 9a77767cf4..3977d0321c 100644
--- a/common/utils/backtrace.h
+++ b/common/utils/backtrace.h
@@ -23,9 +23,16 @@
#ifndef BACKTRACE_H_
#define BACKTRACE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
void display_backtrace(void);
void backtrace_handle_signal(siginfo_t *info);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* BACKTRACE_H_ */
diff --git a/common/utils/threadPool/Makefile b/common/utils/threadPool/Makefile
new file mode 100644
index 0000000000..6f0e884886
--- /dev/null
+++ b/common/utils/threadPool/Makefile
@@ -0,0 +1,8 @@
+all: measurement_display thread-pool-test
+
+measurement_display: measurement_display.c thread-pool.h
+ gcc measurement_display.c -I /data/openairinterface5g.nr/common/utils/ -I. /data/openairinterface5g.nr/common/utils/backtrace.c -lpthread -D TEST_THREAD_POOL -I../LOG -I../../utils/T -o measurement_display
+
+thread-pool-test: thread-pool.c thread-pool.h
+ gcc -g thread-pool.c -I /data/openairinterface5g.nr/common/utils/ -I. /data/openairinterface5g.nr/common/utils/backtrace.c -lpthread -D TEST_THREAD_POOL -I../LOG -I../../utils/T -o thread-pool-test
+
diff --git a/common/utils/threadPool/measurement_display.c b/common/utils/threadPool/measurement_display.c
new file mode 100644
index 0000000000..ac7beca1fe
--- /dev/null
+++ b/common/utils/threadPool/measurement_display.c
@@ -0,0 +1,61 @@
+/*
+ Author: Laurent THOMAS, Open Cells
+ copyleft: OpenAirInterface Software Alliance and it's licence
+*/
+
+#define __USE_GNU
+#define _GNU_SOURCE
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "thread-pool.h"
+
+#define SEP "\t"
+
+uint64_t cpuCyclesMicroSec;
+
+int main(int argc, char *argv[]) {
+ if(argc != 2) {
+ printf("Need one paramter: the trace Linux pipe (fifo)");
+ exit(1);
+ }
+
+ mkfifo(argv[1],0666);
+ int fd=open(argv[1], O_RDONLY);
+
+ if ( fd == -1 ) {
+ perror("open read mode trace file:");
+ exit(1);
+ }
+
+ uint64_t deb=rdtsc();
+ usleep(100000);
+ cpuCyclesMicroSec=(rdtsc()-deb)/100000;
+ printf("Cycles per µs: %lu\n",cpuCyclesMicroSec);
+ printf("Key" SEP "delay to process" SEP "processing time" SEP "delay to be read answer\n");
+ notifiedFIFO_elt_t doneRequest;
+
+ while ( 1 ) {
+ if ( read(fd,&doneRequest, sizeof(doneRequest)) == sizeof(doneRequest)) {
+ printf("%lu" SEP "%lu" SEP "%lu" SEP "%lu" "\n",
+ doneRequest.key,
+ (doneRequest.startProcessingTime-doneRequest.creationTime)/cpuCyclesMicroSec,
+ (doneRequest.endProcessingTime-doneRequest.startProcessingTime)/cpuCyclesMicroSec,
+ (doneRequest.returnTime-doneRequest.endProcessingTime)/cpuCyclesMicroSec
+ );
+ } else {
+ printf("no measurements\n");
+ sleep(1);
+ }
+ }
+}
diff --git a/common/utils/threadPool/thread-pool.c b/common/utils/threadPool/thread-pool.c
new file mode 100644
index 0000000000..4cc56fc9b8
--- /dev/null
+++ b/common/utils/threadPool/thread-pool.c
@@ -0,0 +1,230 @@
+/*
+ Author: Laurent THOMAS, Open Cells
+ copyleft: OpenAirInterface Software Alliance and it's licence
+*/
+
+#define _GNU_SOURCE
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+void displayList(notifiedFIFO_t *nf) {
+ int n=0;
+ notifiedFIFO_elt_t *ptr=nf->outF;
+
+ while(ptr) {
+ printf("element: %d, key: %lu\n",++n,ptr->key);
+ ptr=ptr->next;
+ }
+
+ printf("End of list: %d elements\n",n);
+}
+
+static inline notifiedFIFO_elt_t *pullNotifiedFifoRemember( notifiedFIFO_t *nf, struct one_thread *thr) {
+ mutexlock(nf->lockF);
+
+ while(!nf->outF)
+ condwait(nf->notifF, nf->lockF);
+
+ notifiedFIFO_elt_t *ret=nf->outF;
+ nf->outF=nf->outF->next;
+
+ if (nf->outF==NULL)
+ nf->inF=NULL;
+
+ // For abort feature
+ thr->runningOnKey=ret->key;
+ thr->abortFlag=false;
+ mutexunlock(nf->lockF);
+ return ret;
+}
+
+void *one_thread(void *arg) {
+ struct one_thread *myThread=(struct one_thread *) arg;
+ struct thread_pool *tp=myThread->pool;
+
+ // configure the thread core assignment
+ // TBD: reserve the core for us exclusively
+ if ( myThread->coreID >= 0 && myThread->coreID < get_nprocs_conf()) {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(myThread->coreID, &cpuset);
+ pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
+ }
+
+ //Configure the thread scheduler policy for Linux
+ struct sched_param sparam= {0};
+ sparam.sched_priority = sched_get_priority_max(SCHED_RR);
+ pthread_setschedparam(pthread_self(), SCHED_RR, &sparam);
+ // set the thread name for debugging
+ sprintf(myThread->name,"Tpool_%d",myThread->coreID);
+ pthread_setname_np(pthread_self(), myThread->name );
+
+ // Infinite loop to process requests
+ do {
+ notifiedFIFO_elt_t *elt=pullNotifiedFifoRemember(&tp->incomingFifo, myThread);
+
+ if (tp->measurePerf) elt->startProcessingTime=rdtsc();
+
+ elt->processingFunc(NotifiedFifoData(elt));
+
+ if (tp->measurePerf) elt->endProcessingTime=rdtsc();
+
+ if (elt->reponseFifo) {
+ // Check if the job is still alive, else it has been aborted
+ mutexlock(tp->incomingFifo.lockF);
+
+ if (myThread->abortFlag)
+ delNotifiedFIFO_elt(elt);
+ else
+ pushNotifiedFIFO(elt->reponseFifo, elt);
+
+ mutexunlock(tp->incomingFifo.lockF);
+ }
+ } while (true);
+}
+
+void initTpool(char *params,tpool_t *pool, bool performanceMeas) {
+ memset(pool,0,sizeof(*pool));
+ char *measr=getenv("threadPoolMeasurements");
+ pool->measurePerf=performanceMeas;
+ // force measurement if the output is defined
+ pool->measurePerf=measr!=NULL;
+
+ if (measr) {
+ mkfifo(measr,0666);
+ AssertFatal(-1 != (pool->dummyTraceFd=
+ open(measr, O_RDONLY| O_NONBLOCK)),"");
+ AssertFatal(-1 != (pool->traceFd=
+ open(measr, O_WRONLY|O_APPEND|O_NOATIME|O_NONBLOCK)),"");
+ } else
+ pool->traceFd=-1;
+
+ //Configure the thread scheduler policy for Linux
+ struct sched_param sparam= {0};
+ sparam.sched_priority = sched_get_priority_max(SCHED_RR)-1;
+ pthread_setschedparam(pthread_self(), SCHED_RR, &sparam);
+ pool->activated=true;
+ initNotifiedFIFO(&pool->incomingFifo);
+ char *saveptr, * curptr;
+ pool->nbThreads=0;
+ pool->restrictRNTI=false;
+ curptr=strtok_r(params,",",&saveptr);
+
+ while ( curptr!=NULL ) {
+ int c=toupper(curptr[0]);
+
+ switch (c) {
+ case 'U':
+ pool->restrictRNTI=true;
+ break;
+
+ case 'N':
+ pool->activated=false;
+ break;
+
+ default:
+ pool->allthreads=(struct one_thread *)malloc(sizeof(struct one_thread));
+ pool->allthreads->next=pool->allthreads;
+ printf("create a thread for core %d\n", atoi(curptr));
+ pool->allthreads->coreID=atoi(curptr);
+ pool->allthreads->id=pool->nbThreads;
+ pool->allthreads->pool=pool;
+ pthread_create(&pool->allthreads->threadID, NULL, one_thread, (void *)pool->allthreads);
+ pool->nbThreads++;
+ }
+
+ curptr=strtok_r(NULL,",",&saveptr);
+ }
+
+ if (pool->activated && pool->nbThreads==0) {
+ printf("No servers created in the thread pool, exit\n");
+ exit(1);
+ }
+}
+
+#ifdef TEST_THREAD_POOL
+
+struct testData {
+ int id;
+ char txt[30];
+};
+
+void processing(void *arg) {
+ struct testData *in=(struct testData *)arg;
+ printf("doing: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
+ sprintf(in->txt,"Done by %ld, job %d", pthread_self(), in->id);
+ usleep(rand()%100);
+ printf("done: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
+}
+
+int main() {
+ notifiedFIFO_t myFifo;
+ initNotifiedFIFO(&myFifo);
+ pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 1234,NULL,NULL));
+
+ for(int i=10; i>1; i--) {
+ pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 1000+i,NULL,NULL));
+ }
+
+ displayList(&myFifo);
+ notifiedFIFO_elt_t *tmp=pullNotifiedFIFO(&myFifo);
+ printf("pulled: %lu\n", tmp->key);
+ displayList(&myFifo);
+ tmp=pullNotifiedFIFO(&myFifo);
+ printf("pulled: %lu\n", tmp->key);
+ displayList(&myFifo);
+ abortNotifiedFIFO(&myFifo,1005);
+ printf("aborted 1005\n");
+ displayList(&myFifo);
+ pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 12345678, NULL, NULL));
+ displayList(&myFifo);
+ abortNotifiedFIFO(&myFifo,12345678);
+ printf("aborted 12345678\n");
+ displayList(&myFifo);
+
+ do {
+ tmp=pollNotifiedFIFO(&myFifo);
+
+ if (tmp) {
+ printf("pulled: %lu\n", tmp->key);
+ displayList(&myFifo);
+ } else
+ printf("Empty list \n");
+ } while(tmp);
+
+ tpool_t pool;
+ char params[]="1,2,3,u";
+ initTpool(params,&pool, true);
+ notifiedFIFO_t worker_back;
+ initNotifiedFIFO(&worker_back);
+
+ for (int i=0; i <1000 ; i++) {
+ notifiedFIFO_elt_t *work=newNotifiedFIFO_elt(sizeof(struct testData), i, &worker_back, processing);
+ struct testData *x=(struct testData *)NotifiedFifoData(work);
+ x->id=i;
+ pushTpool(&pool, work);
+ }
+
+ do {
+ tmp=pullTpool(&worker_back,&pool);
+
+ if (tmp) {
+ struct testData *dd=NotifiedFifoData(tmp);
+ printf("Result: %s\n",dd->txt);
+ delNotifiedFIFO_elt(tmp);
+ } else
+ printf("Empty list \n");
+
+ abortTpool(&pool,510);
+ } while(tmp);
+
+ return 0;
+}
+#endif
diff --git a/common/utils/threadPool/thread-pool.h b/common/utils/threadPool/thread-pool.h
new file mode 100644
index 0000000000..6f34508c5a
--- /dev/null
+++ b/common/utils/threadPool/thread-pool.h
@@ -0,0 +1,244 @@
+/*
+ Author: Laurent THOMAS, Open Cells
+ copyleft: OpenAirInterface Software Alliance and it's licence
+*/
+
+#ifndef THREAD_POOL_H
+#define THREAD_POOL_H
+#include
+#include
+#include
+#include
+#include
+#include
+
+#ifdef DEBUG
+ #define THREADINIT PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+#else
+ #define THREADINIT PTHREAD_MUTEX_INITIALIZER
+#endif
+#define mutexinit(mutex) AssertFatal(pthread_mutex_init(&mutex,NULL)==0,"");
+#define condinit(signal) AssertFatal(pthread_cond_init(&signal,NULL)==0,"");
+#define mutexlock(mutex) AssertFatal(pthread_mutex_lock(&mutex)==0,"");
+#define mutextrylock(mutex) pthread_mutex_trylock(&mutex)
+#define mutexunlock(mutex) AssertFatal(pthread_mutex_unlock(&mutex)==0,"");
+#define condwait(condition, mutex) AssertFatal(pthread_cond_wait(&condition, &mutex)==0,"");
+#define condbroadcast(signal) AssertFatal(pthread_cond_broadcast(&signal)==0,"");
+#define condsignal(signal) AssertFatal(pthread_cond_broadcast(&signal)==0,"");
+
+typedef struct notifiedFIFO_elt_s {
+ struct notifiedFIFO_elt_s *next;
+ uint64_t key; //To filter out elements
+ struct notifiedFIFO_s *reponseFifo;
+ void (*processingFunc)(void *);
+ bool malloced;
+ uint64_t creationTime;
+ uint64_t startProcessingTime;
+ uint64_t endProcessingTime;
+ uint64_t returnTime;
+ void *msgData;
+} notifiedFIFO_elt_t;
+
+typedef struct notifiedFIFO_s {
+ notifiedFIFO_elt_t *outF;
+ notifiedFIFO_elt_t *inF;
+ pthread_mutex_t lockF;
+ pthread_cond_t notifF;
+} notifiedFIFO_t;
+
+// You can use this allocator or use any piece of memory
+static inline notifiedFIFO_elt_t *newNotifiedFIFO_elt(int size,
+ uint64_t key,
+ notifiedFIFO_t *reponseFifo,
+ void (*processingFunc)(void *)) {
+ notifiedFIFO_elt_t *ret;
+ AssertFatal( NULL != (ret=(notifiedFIFO_elt_t *) malloc(sizeof(notifiedFIFO_elt_t)+size+32)), "");
+ ret->next=NULL;
+ ret->key=key;
+ ret->reponseFifo=reponseFifo;
+ ret->processingFunc=processingFunc;
+ // We set user data piece aligend 32 bytes to be able to process it with SIMD
+ ret->msgData=(void *)ret+(sizeof(notifiedFIFO_elt_t)/32+1)*32;
+ ret->malloced=true;
+ return ret;
+}
+
+static inline void *NotifiedFifoData(notifiedFIFO_elt_t *elt) {
+ return elt->msgData;
+}
+
+static inline void delNotifiedFIFO_elt(notifiedFIFO_elt_t *elt) {
+ if (elt->malloced) {
+ elt->malloced=false;
+ free(elt);
+ } else
+ printf("delNotifiedFIFO on something not allocated by newNotifiedFIFO\n");
+
+ //LOG_W(UTIL,"delNotifiedFIFO on something not allocated by newNotifiedFIFO\n");
+}
+
+static inline void initNotifiedFIFO(notifiedFIFO_t *nf) {
+ mutexinit(nf->lockF);
+ condinit (nf->notifF);
+ nf->inF=NULL;
+ nf->outF=NULL;
+ // No delete function: the creator has only to free the memory
+}
+
+static inline void pushNotifiedFIFO(notifiedFIFO_t *nf, notifiedFIFO_elt_t *msg) {
+ mutexlock(nf->lockF);
+ msg->next=NULL;
+
+ if (nf->outF == NULL)
+ nf->outF = msg;
+
+ if (nf->inF)
+ nf->inF->next = msg;
+
+ nf->inF = msg;
+ condbroadcast(nf->notifF);
+ mutexunlock(nf->lockF);
+}
+
+static inline notifiedFIFO_elt_t *pullNotifiedFIFO(notifiedFIFO_t *nf) {
+ mutexlock(nf->lockF);
+
+ while(!nf->outF)
+ condwait(nf->notifF, nf->lockF);
+
+ notifiedFIFO_elt_t *ret=nf->outF;
+ nf->outF=nf->outF->next;
+
+ if (nf->outF==NULL)
+ nf->inF=NULL;
+
+ mutexunlock(nf->lockF);
+ return ret;
+}
+
+static inline notifiedFIFO_elt_t *pollNotifiedFIFO(notifiedFIFO_t *nf) {
+ int tmp=mutextrylock(nf->lockF);
+
+ if (tmp != 0 )
+ return NULL;
+
+ notifiedFIFO_elt_t *ret=nf->outF;
+
+ if (ret!=NULL)
+ nf->outF=nf->outF->next;
+
+ if (nf->outF==NULL)
+ nf->inF=NULL;
+
+ mutexunlock(nf->lockF);
+ return ret;
+}
+
+// This function aborts all messages matching the key
+// If the queue is used in thread pools, it doesn't cancels already running processing
+// because the message has already been picked
+static inline void abortNotifiedFIFO(notifiedFIFO_t *nf, uint64_t key) {
+ mutexlock(nf->lockF);
+ notifiedFIFO_elt_t **start=&nf->outF;
+
+ while(*start!=NULL) {
+ if ( (*start)->key == key ) {
+ notifiedFIFO_elt_t *request=*start;
+ *start=(*start)->next;
+ delNotifiedFIFO_elt(request);
+ }
+
+ if (*start != NULL)
+ start=&(*start)->next;
+ }
+
+ mutexunlock(nf->lockF);
+}
+
+struct one_thread {
+ pthread_t threadID;
+ int id;
+ int coreID;
+ char name[256];
+ uint64_t runningOnKey;
+ bool abortFlag;
+ struct thread_pool *pool;
+ struct one_thread *next;
+};
+
+typedef struct thread_pool {
+ int activated;
+ bool measurePerf;
+ int traceFd;
+ int dummyTraceFd;
+ uint64_t cpuCyclesMicroSec;
+ uint64_t startProcessingUE;
+ int nbThreads;
+ bool restrictRNTI;
+ notifiedFIFO_t incomingFifo;
+ struct one_thread *allthreads;
+} tpool_t;
+
+static inline void pushTpool(tpool_t *t, notifiedFIFO_elt_t *msg) {
+ if (t->measurePerf) msg->creationTime=rdtsc();
+
+ pushNotifiedFIFO(&t->incomingFifo, msg);
+}
+
+static inline notifiedFIFO_elt_t *pullTpool(notifiedFIFO_t *responseFifo, tpool_t *t) {
+ notifiedFIFO_elt_t *msg= pullNotifiedFIFO(responseFifo);
+
+ if (t->measurePerf)
+ msg->returnTime=rdtsc();
+
+ if (t->traceFd)
+ if(write(t->traceFd, msg, sizeof(*msg)));
+
+ return msg;
+}
+
+static inline notifiedFIFO_elt_t *tryPullTpool(notifiedFIFO_t *responseFifo, tpool_t *t) {
+ notifiedFIFO_elt_t *msg= pollNotifiedFIFO(responseFifo);
+
+ if (msg == NULL)
+ return NULL;
+
+ if (t->measurePerf)
+ msg->returnTime=rdtsc();
+
+ if (t->traceFd)
+ if(write(t->traceFd, msg, sizeof(*msg)));
+
+ return msg;
+}
+
+static inline void abortTpool(tpool_t *t, uint64_t key) {
+ notifiedFIFO_t *nf=&t->incomingFifo;
+ mutexlock(nf->lockF);
+ notifiedFIFO_elt_t **start=&nf->outF;
+
+ while(*start!=NULL) {
+ if ( (*start)->key == key ) {
+ notifiedFIFO_elt_t *request=*start;
+ *start=(*start)->next;
+ delNotifiedFIFO_elt(request);
+ }
+
+ if (*start != NULL)
+ start=&(*start)->next;
+ }
+
+ struct one_thread *ptr=t->allthreads;
+
+ while(ptr!=NULL) {
+ if (ptr->runningOnKey==key)
+ ptr->abortFlag=true;
+
+ ptr=ptr->next;
+ }
+
+ mutexunlock(nf->lockF);
+}
+void initTpool(char *params,tpool_t *pool, bool performanceMeas);
+
+#endif
diff --git a/common/utils/threadPool/thread-pool.md b/common/utils/threadPool/thread-pool.md
new file mode 100644
index 0000000000..2b6336fb60
--- /dev/null
+++ b/common/utils/threadPool/thread-pool.md
@@ -0,0 +1,71 @@
+# Thread pool
+
+The thread pool is a working server, made of a set of worker threads that can be mapped on CPU cores.
+
+Each worker loop on pick from the same input queue jobs to do.
+When a job is done, the worker sends a return if a return is defined.
+
+A selective abort allows to cancel parallel jobs (usage: a client pushed jobs, but from a response of one job, the other linked jobs becomes useless).
+
+All the thread pool functions are thread safe, nevertheless the working functions are implemented by the thread pool client, so the client has to tackle the parallel execution of his functions called "processingFunc" hereafter.
+
+## license
+Author: Laurent Thomas, Open cells project
+The owner share this piece code to Openairsoftware alliance as per OSA license terms
+
+# jobs
+
+A job is a message (notifiedFIFO_elt_t):
+next: internal FIFO chain, do not set it
+key: a long int that the client can use to identify a message or a group of messages
+responseFifo: if the client defines a response FIFO, the message will be posted back after processing
+processingFunc: any funtion (type void processingFunc(void *)) that the worker will launch
+msgData: the data passed to processingFunc. It can be added automatically, or you can set it to a buffer you are managing
+malloced: a boolean that enable internal free in these cases: no return Fifo or Abort feature
+
+The job messages can be created with newNotifiedFIFO_elt() and delNotifiedFIFO_elt() or managed by the client.
+
+# Queues of jobs
+
+Queues are type of: notifiedFIFO_t that must be initialized by init_notifiedFIFO()
+No delete function is required, the creator has only to free the data of type notifiedFIFO_t
+
+push_notifiedFIFO() add a job in the queue
+pull_notifiedFIFO() is blocking, poll_notifiedFIFO() is non blocking
+
+abort_notifiedFIFO() allows the customer to delete all waiting jobs that match with the key (see key in jobs definition)
+
+# Thread pools
+
+## initialization
+The clients can create one or more thread pools with init_tpool()
+the params string structure: describes a list of cores, separated by "," that run a worker thread
+
+If the core exists on the CPU, the thread pool initialization sets the affinity between this thread and the related code (use negative values is allowed, so the thread will never be mapped on a specific core).
+
+The threads are all Linux real time scheduler, their name is set automatically is "Tpool_"
+
+## adding jobs
+The client create their jobs messages as a notifiedFIFO_elt_t, then they push it with pushTpool() (that internally calls push_notifiedFIFO())
+
+If they need a return, they have to create response queues with init_notifiedFIFO() and set this FIFO pointer in the notifiedFIFO_elt_t before pushing the job.
+
+## abort
+
+A abort service abortTpool() allows to abort all jobs that match a key (see jobs "key"). When the abort returns, it garanties no job (matching the key) response will be posted on response queues.
+
+Nevertheless, jobs already performed before the return of abortTpool() are pushed in the response Fifo queue.
+
+## Performance measurements
+
+A performance measurement is integrated: the pool will automacillay fill timestamps:
+
+* creationTime: time the request is push to the pool;
+* startProcessingTime: time a worker start to run on the job
+* endProcessingTime: time the worker finished the job
+* returnTime: time the client reads the result
+
+if you set the environement variable: thread-pool-measurements to a valid file name
+These measurements will be wrote to this Linux pipe.
+
+A tool to read the linux fifo and display it in ascii is provided: see the local directory Makefile for this tool and to compile the thread pool unitary tests.
diff --git a/executables/nr-ue.c b/executables/nr-ue.c
new file mode 100644
index 0000000000..402c379687
--- /dev/null
+++ b/executables/nr-ue.c
@@ -0,0 +1,732 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "executables/nr-uesoftmodem.h"
+
+#include "LAYER2/NR_MAC_UE/mac.h"
+//#include "RRC/LTE/rrc_extern.h"
+#include "PHY_INTERFACE/phy_interface_extern.h"
+
+#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
+//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
+
+#include "fapi_nr_ue_l1.h"
+#include "PHY/phy_extern_nr_ue.h"
+#include "PHY/INIT/phy_init.h"
+#include "PHY/MODULATION/modulation_UE.h"
+#include "LAYER2/NR_MAC_UE/mac_proto.h"
+#include "RRC/NR_UE/rrc_proto.h"
+
+//#ifndef NO_RAT_NR
+#include "SCHED_NR/phy_frame_config_nr.h"
+//#endif
+#include "SCHED_NR_UE/defs.h"
+
+#include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
+
+#include "common/utils/LOG/log.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
+
+#include "T.h"
+
+#ifdef XFORMS
+ #include "PHY/TOOLS/nr_phy_scope.h"
+
+ extern char do_forms;
+#endif
+
+
+extern double cpuf;
+//static nfapi_nr_config_request_t config_t;
+//static nfapi_nr_config_request_t* config =&config_t;
+
+/*
+ * NR SLOT PROCESSING SEQUENCE
+ *
+ * Processing occurs with following steps for connected mode:
+ *
+ * - Rx samples for a slot are received,
+ * - PDCCH processing (including DCI extraction for downlink and uplink),
+ * - PDSCH processing (including transport blocks decoding),
+ * - PUCCH/PUSCH (transmission of acknowledgements, CSI, ... or data).
+ *
+ * Time between reception of the slot and related transmission depends on UE processing performance.
+ * It is defined by the value NR_UE_CAPABILITY_SLOT_RX_TO_TX.
+ *
+ * In NR, network gives the duration between Rx slot and Tx slot in the DCI:
+ * - for reception of a PDSCH and its associated acknowledgment slot (with a PUCCH or a PUSCH),
+ * - for reception of an uplink grant and its associated PUSCH slot.
+ *
+ * So duration between reception and it associated transmission depends on its transmission slot given in the DCI.
+ * NR_UE_CAPABILITY_SLOT_RX_TO_TX means the minimum duration but higher duration can be given by the network because UE can support it.
+ *
+ * Slot k
+ * -------+------------+--------
+ * Frame | Tx samples |
+ * Subframe | buffer |
+ * Slot n -------+------------+--------
+ * ------ +------------+-------- |
+ * | Rx samples | |
+ * | buffer | |
+ * -------+------------+-------- |
+ * | |
+ * V |
+ * +------------+ |
+ * | PDCCH | |
+ * | processing | |
+ * +------------+ |
+ * | | |
+ * | v |
+ * | +------------+ |
+ * | | PDSCH | |
+ * | | processing | decoding result |
+ * | +------------+ -> ACK/NACK of PDSCH |
+ * | | |
+ * | v |
+ * | +-------------+------------+ |
+ * | | PUCCH/PUSCH | Tx samples | |
+ * | | processing | transfer | |
+ * | +-------------+------------+ |
+ * | |
+ * |/___________________________________________________________\|
+ * \ duration between reception and associated transmission /
+ *
+ * Remark: processing is done slot by slot, it can be distribute on different threads which are executed in parallel.
+ * This is an architecture optimization in order to cope with real time constraints.
+ * By example, for LTE, subframe processing is spread over 4 different threads.
+ *
+ */
+
+#ifndef NO_RAT_NR
+ #define DURATION_RX_TO_TX (NR_UE_CAPABILITY_SLOT_RX_TO_TX) /* for NR this will certainly depends to such UE capability which is not yet defined */
+#else
+ #define DURATION_RX_TO_TX (4) /* For LTE, this duration is fixed to 4 and it is linked to LTE standard for both modes FDD/TDD */
+#endif
+
+#define FRAME_PERIOD 100000000ULL
+#define DAQ_PERIOD 66667ULL
+#define FIFO_PRIORITY 40
+
+typedef enum {
+ pss=0,
+ pbch=1,
+ si=2
+} sync_mode_t;
+
+
+PHY_VARS_NR_UE *init_nr_ue_vars(NR_DL_FRAME_PARMS *frame_parms,
+ uint8_t UE_id,
+ uint8_t abstraction_flag)
+
+{
+ PHY_VARS_NR_UE *ue;
+
+ if (frame_parms!=(NR_DL_FRAME_PARMS *)NULL) { // if we want to give initial frame parms, allocate the PHY_VARS_UE structure and put them in
+ ue = (PHY_VARS_NR_UE *)malloc(sizeof(PHY_VARS_NR_UE));
+ memset(ue,0,sizeof(PHY_VARS_NR_UE));
+ memcpy(&(ue->frame_parms), frame_parms, sizeof(NR_DL_FRAME_PARMS));
+ } else ue = PHY_vars_UE_g[UE_id][0];
+
+ ue->Mod_id = UE_id;
+ ue->mac_enabled = 1;
+ // initialize all signal buffers
+ init_nr_ue_signal(ue,1,abstraction_flag);
+ // intialize transport
+ init_nr_ue_transport(ue,abstraction_flag);
+ return(ue);
+}
+
+/*!
+ * It performs band scanning and synchonization.
+ * \param arg is a pointer to a \ref PHY_VARS_NR_UE structure.
+ */
+
+typedef struct syncData_s {
+ PHY_VARS_NR_UE *UE;
+} syncData_t;
+
+static void UE_synch(void *arg) {
+ syncData_t *syncD=(syncData_t *) arg;
+ int i, hw_slot_offset;
+ PHY_VARS_NR_UE *UE = syncD->UE;
+ int current_band = 0;
+ int current_offset = 0;
+ sync_mode_t sync_mode = pbch;
+ int CC_id = UE->CC_id;
+ int freq_offset=0;
+ UE->is_synchronized = 0;
+
+ if (UE->UE_scan == 0) {
+ int ind;
+
+ get_band(downlink_frequency[CC_id][0], &UE->frame_parms.eutra_band, &uplink_frequency_offset[CC_id][0], &UE->frame_parms.frame_type);
+
+ LOG_I( PHY, "[SCHED][UE] Check absolute frequency DL %"PRIu32", UL %"PRIu32" (oai_exit %d, rx_num_channels %d)\n",
+ downlink_frequency[0][0], downlink_frequency[0][0]+uplink_frequency_offset[0][0],
+ oai_exit, openair0_cfg[0].rx_num_channels);
+
+ for (i=0; irf_map.card].rx_num_channels; i++) {
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
+ downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
+ openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
+
+ if (uplink_frequency_offset[CC_id][i] != 0) //
+ openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_FDD;
+ else //FDD
+ openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_TDD;
+ }
+
+ sync_mode = pbch;
+ } else {
+ current_band=0;
+ LOG_E(PHY,"Fixme!\n");
+ /*
+ for (i=0; irf_map.card].rx_num_channels; i++) {
+ downlink_frequency[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[CC_id].dl_min;
+ uplink_frequency_offset[UE->rf_map.card][UE->rf_map.chain+i] =
+ bands_to_scan.band_info[CC_id].ul_min-bands_to_scan.band_info[CC_id].dl_min;
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
+ downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
+ openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;
+ }
+ */
+ }
+
+ LOG_W(PHY, "Starting sync detection\n");
+
+ switch (sync_mode) {
+ /*
+ case pss:
+ LOG_I(PHY,"[SCHED][UE] Scanning band %d (%d), freq %u\n",bands_to_scan.band_info[current_band].band, current_band,bands_to_scan.band_info[current_band].dl_min+current_offset);
+ //lte_sync_timefreq(UE,current_band,bands_to_scan.band_info[current_band].dl_min+current_offset);
+ current_offset += 20000000; // increase by 20 MHz
+
+ if (current_offset > bands_to_scan.band_info[current_band].dl_max-bands_to_scan.band_info[current_band].dl_min) {
+ current_band++;
+ current_offset=0;
+ }
+
+ if (current_band==bands_to_scan.nbands) {
+ current_band=0;
+ oai_exit=1;
+ }
+
+ for (i=0; irf_map.card].rx_num_channels; i++) {
+ downlink_frequency[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[current_band].dl_min+current_offset;
+ uplink_frequency_offset[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[current_band].ul_min-bands_to_scan.band_info[0].dl_min + current_offset;
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
+ openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;
+
+ if (UE->UE_scan_carrier) {
+ openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
+ }
+ }
+
+ break;
+ */
+
+ case pbch:
+ LOG_I(PHY, "[UE thread Synch] Running Initial Synch (mode %d)\n",UE->mode);
+
+ if (nr_initial_sync( UE, UE->mode ) == 0) {
+ freq_offset = UE->common_vars.freq_offset; // frequency offset computed with pss in initial sync
+ hw_slot_offset = (UE->rx_offset<<1) / UE->frame_parms.samples_per_slot;
+ LOG_I(PHY,"Got synch: hw_slot_offset %d, carrier off %d Hz, rxgain %d (DL %u, UL %u), UE_scan_carrier %d\n",
+ hw_slot_offset,
+ freq_offset,
+ UE->rx_total_gain_dB,
+ downlink_frequency[0][0]+freq_offset,
+ downlink_frequency[0][0]+uplink_frequency_offset[0][0]+freq_offset,
+ UE->UE_scan_carrier );
+
+ // rerun with new cell parameters and frequency-offset
+ for (i=0; irf_map.card].rx_num_channels; i++) {
+ openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
+
+ if (freq_offset >= 0)
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] += abs(freq_offset);
+ else
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] -= abs(freq_offset);
+
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i]+uplink_frequency_offset[CC_id][i];
+ downlink_frequency[CC_id][i] = openair0_cfg[CC_id].rx_freq[i];
+ }
+
+ // reconfigure for potentially different bandwidth
+ switch(UE->frame_parms.N_RB_DL) {
+ case 6:
+ openair0_cfg[UE->rf_map.card].sample_rate =1.92e6;
+ openair0_cfg[UE->rf_map.card].rx_bw =.96e6;
+ openair0_cfg[UE->rf_map.card].tx_bw =.96e6;
+ // openair0_cfg[0].rx_gain[0] -= 12;
+ break;
+
+ case 25:
+ openair0_cfg[UE->rf_map.card].sample_rate =7.68e6;
+ openair0_cfg[UE->rf_map.card].rx_bw =2.5e6;
+ openair0_cfg[UE->rf_map.card].tx_bw =2.5e6;
+ // openair0_cfg[0].rx_gain[0] -= 6;
+ break;
+
+ case 50:
+ openair0_cfg[UE->rf_map.card].sample_rate =15.36e6;
+ openair0_cfg[UE->rf_map.card].rx_bw =5.0e6;
+ openair0_cfg[UE->rf_map.card].tx_bw =5.0e6;
+ // openair0_cfg[0].rx_gain[0] -= 3;
+ break;
+
+ case 100:
+ openair0_cfg[UE->rf_map.card].sample_rate=30.72e6;
+ openair0_cfg[UE->rf_map.card].rx_bw=10.0e6;
+ openair0_cfg[UE->rf_map.card].tx_bw=10.0e6;
+ // openair0_cfg[0].rx_gain[0] -= 0;
+ break;
+ }
+
+ if (UE->mode != loop_through_memory) {
+ UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
+ //UE->rfdevice.trx_set_gains_func(&openair0,&openair0_cfg[0]);
+ //UE->rfdevice.trx_stop_func(&UE->rfdevice);
+ // sleep(1);
+ //nr_init_frame_parms_ue(&UE->frame_parms);
+ /*if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
+ LOG_E(HW,"Could not start the device\n");
+ oai_exit=1;
+ }*/
+ }
+
+ if (UE->UE_scan_carrier == 1) {
+ UE->UE_scan_carrier = 0;
+ } else {
+ UE->is_synchronized = 1;
+ }
+ } else {
+ // initial sync failed
+ // calculate new offset and try again
+ if (UE->UE_scan_carrier == 1) {
+ if (freq_offset >= 0)
+ freq_offset += 100;
+
+ freq_offset *= -1;
+ LOG_I(PHY, "[initial_sync] trying carrier off %d Hz, rxgain %d (DL %u, UL %u)\n",
+ freq_offset,
+ UE->rx_total_gain_dB,
+ downlink_frequency[0][0]+freq_offset,
+ downlink_frequency[0][0]+uplink_frequency_offset[0][0]+freq_offset );
+
+ for (i=0; irf_map.card].rx_num_channels; i++) {
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+freq_offset;
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i]+freq_offset;
+ openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
+
+ if (UE->UE_scan_carrier==1)
+ openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
+ }
+
+ if (UE->mode != loop_through_memory)
+ UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
+ }// initial_sync=0
+
+ break;
+
+ case si:
+ default:
+ break;
+ }
+ }
+}
+
+void processSubframeRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
+ // Process Rx data for one sub-frame
+ if (slot_select_nr(&UE->frame_parms, proc->frame_tx, proc->nr_tti_tx) & NR_DOWNLINK_SLOT) {
+ //clean previous FAPI MESSAGE
+ UE->rx_ind.number_pdus = 0;
+ UE->dci_ind.number_of_dcis = 0;
+ //clean previous FAPI MESSAGE
+ // call L2 for DL_CONFIG (DCI)
+ UE->dcireq.module_id = UE->Mod_id;
+ UE->dcireq.gNB_index = 0;
+ UE->dcireq.cc_id = 0;
+ UE->dcireq.frame = proc->frame_rx;
+ UE->dcireq.slot = proc->nr_tti_rx;
+ nr_ue_dcireq(&UE->dcireq); //to be replaced with function pointer later
+ NR_UE_MAC_INST_t *UE_mac = get_mac_inst(0);
+ UE_mac->scheduled_response.dl_config = &UE->dcireq.dl_config_req;
+ UE_mac->scheduled_response.slot = proc->nr_tti_rx;
+ nr_ue_scheduled_response(&UE_mac->scheduled_response);
+ //write_output("uerxdata_frame.m", "uerxdata_frame", UE->common_vars.rxdata[0], UE->frame_parms.samples_per_frame, 1, 1);
+ printf("Processing slot %d\n",proc->nr_tti_rx);
+#ifdef UE_SLOT_PARALLELISATION
+ phy_procedures_slot_parallelization_nrUE_RX( UE, proc, 0, 0, 1, UE->mode, no_relay, NULL );
+#else
+ phy_procedures_nrUE_RX( UE, proc, 0, 1, UE->mode);
+ // printf(">>> nr_ue_pdcch_procedures ended\n");
+#endif
+ }
+
+ if (UE->mac_enabled==1) {
+ // trigger L2 to run ue_scheduler thru IF module
+ // [TODO] mapping right after NR initial sync
+ if(UE->if_inst != NULL && UE->if_inst->ul_indication != NULL) {
+ UE->ul_indication.module_id = 0;
+ UE->ul_indication.gNB_index = 0;
+ UE->ul_indication.cc_id = 0;
+ UE->ul_indication.frame = proc->frame_rx;
+ UE->ul_indication.slot = proc->nr_tti_rx;
+ UE->if_inst->ul_indication(&UE->ul_indication);
+ }
+ }
+}
+
+/*!
+ * \brief This is the UE thread for RX subframe n and TX subframe n+4.
+ * This thread performs the phy_procedures_UE_RX() on every received slot.
+ * then, if TX is enabled it performs TX for n+4.
+ * \param arg is a pointer to a \ref PHY_VARS_NR_UE structure.
+ * \returns a pointer to an int. The storage is not on the heap and must not be freed.
+ */
+
+typedef struct processingData_s {
+ UE_nr_rxtx_proc_t proc;
+ PHY_VARS_NR_UE *UE;
+} processingData_t;
+
+void UE_processing(void *arg) {
+ processingData_t *rxtxD=(processingData_t *) arg;
+ UE_nr_rxtx_proc_t *proc = &rxtxD->proc;
+ PHY_VARS_NR_UE *UE = rxtxD->UE;
+ processSubframeRX(UE, proc);
+ //printf(">>> mac ended\n");
+ // Prepare the future Tx data
+#if 0
+#ifndef NO_RAT_NR
+
+ if (slot_select_nr(&UE->frame_parms, proc->frame_tx, proc->nr_tti_tx) & NR_UPLINK_SLOT)
+#else
+ if ((subframe_select( &UE->frame_parms, proc->subframe_tx) == SF_UL) ||
+ (UE->frame_parms.frame_type == FDD) )
+#endif
+ if (UE->mode != loop_through_memory)
+ phy_procedures_nrUE_TX(UE,proc,0,0,UE->mode,no_relay);
+
+ //phy_procedures_UE_TX(UE,proc,0,0,UE->mode,no_relay);
+#endif
+#if 0
+
+ if ((subframe_select( &UE->frame_parms, proc->subframe_tx) == SF_S) &&
+ (UE->frame_parms.frame_type == TDD))
+ if (UE->mode != loop_through_memory)
+ //phy_procedures_UE_S_TX(UE,0,0,no_relay);
+ updateTimes(current, &t3, 10000, timing_proc_name);
+
+#endif
+}
+
+void readFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
+ void *rxp[NB_ANTENNAS_RX];
+ void *dummy_tx[UE->frame_parms.nb_antennas_tx];
+
+ for (int i=0; iframe_parms.nb_antennas_tx; i++)
+ dummy_tx[i]=malloc16_clear(UE->frame_parms.samples_per_subframe*4);
+
+ for(int x=0; x<10; x++) {
+ for (int i=0; iframe_parms.nb_antennas_rx; i++)
+ rxp[i] = ((void *)&UE->common_vars.rxdata[i][0]) + 4*x*UE->frame_parms.samples_per_subframe;
+
+ AssertFatal( UE->frame_parms.samples_per_subframe ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ timestamp,
+ rxp,
+ UE->frame_parms.samples_per_subframe,
+ UE->frame_parms.nb_antennas_rx), "");
+ }
+
+ for (int i=0; iframe_parms.nb_antennas_tx; i++)
+ free(dummy_tx[i]);
+}
+
+void trashFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
+ void *dummy_tx[UE->frame_parms.nb_antennas_tx];
+
+ for (int i=0; iframe_parms.nb_antennas_tx; i++)
+ dummy_tx[i]=malloc16_clear(UE->frame_parms.samples_per_subframe*4);
+
+ void *dummy_rx[UE->frame_parms.nb_antennas_rx];
+
+ for (int i=0; iframe_parms.nb_antennas_rx; i++)
+ dummy_rx[i]=malloc16(UE->frame_parms.samples_per_subframe*4);
+
+ for (int sf=0; sfrfdevice.trx_read_func(&UE->rfdevice,
+ timestamp,
+ dummy_rx,
+ UE->frame_parms.samples_per_subframe,
+ UE->frame_parms.nb_antennas_rx);
+ }
+
+ for (int i=0; iframe_parms.nb_antennas_tx; i++)
+ free(dummy_tx[i]);
+
+ for (int i=0; iframe_parms.nb_antennas_rx; i++)
+ free(dummy_rx[i]);
+}
+
+void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
+ if (UE->no_timing_correction==0) {
+ LOG_I(PHY,"Resynchronizing RX by %d samples (mode = %d)\n",UE->rx_offset,UE->mode);
+ void *dummy_tx[UE->frame_parms.nb_antennas_tx];
+
+ for (int i=0; iframe_parms.nb_antennas_tx; i++)
+ dummy_tx[i]=malloc16_clear(UE->frame_parms.samples_per_subframe*4);
+
+ for ( int size=UE->rx_offset ; size > 0 ; size -= UE->frame_parms.samples_per_subframe ) {
+ int unitTransfer=size>UE->frame_parms.samples_per_subframe ? UE->frame_parms.samples_per_subframe : size ;
+ AssertFatal(unitTransfer ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ timestamp,
+ (void **)UE->common_vars.rxdata,
+ unitTransfer,
+ UE->frame_parms.nb_antennas_rx),"");
+ }
+
+ for (int i=0; iframe_parms.nb_antennas_tx; i++)
+ free(dummy_tx[i]);
+ }
+}
+
+int computeSamplesShift(PHY_VARS_NR_UE *UE) {
+ if ( getenv("RFSIMULATOR") != 0) {
+ LOG_E(PHY,"SET rx_offset %d \n",UE->rx_offset);
+ //UE->rx_offset_diff=0;
+ return 0;
+ }
+
+ // compute TO compensation that should be applied for this frame
+ if ( UE->rx_offset < 5*UE->frame_parms.samples_per_slot &&
+ UE->rx_offset > 0 )
+ return -1 ;
+
+ if ( UE->rx_offset > 5*UE->frame_parms.samples_per_slot &&
+ UE->rx_offset < 10*UE->frame_parms.samples_per_slot )
+ return 1;
+
+ return 0;
+}
+
+void *UE_thread(void *arg) {
+ PHY_VARS_NR_UE *UE = (PHY_VARS_NR_UE *) arg;
+ // int tx_enabled = 0;
+ openair0_timestamp timestamp;
+ void *rxp[NB_ANTENNAS_RX], *txp[NB_ANTENNAS_TX];
+ int start_rx_stream = 0;
+ const uint16_t table_sf_slot[20] = {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9};
+ AssertFatal(0== openair0_device_load(&(UE->rfdevice), &openair0_cfg[0]), "");
+ UE->rfdevice.host_type = RAU_HOST;
+ AssertFatal(UE->rfdevice.trx_start_func(&UE->rfdevice) == 0, "Could not start the device\n");
+ notifiedFIFO_t nf;
+ initNotifiedFIFO(&nf);
+ bool syncRunning=false;
+ notifiedFIFO_elt_t *syncMsg=newNotifiedFIFO_elt(sizeof(syncData_t),0,&nf,UE_synch);
+ syncData_t *syncD=(syncData_t *)NotifiedFifoData(syncMsg);
+ syncD->UE=UE;
+ int nbSlotProcessing=0;
+ int thread_idx=0;
+ notifiedFIFO_elt_t *processingMsg[RX_NB_TH];
+
+ for (int i=0; iUE=UE;
+ }
+
+ const int nb_slot_frame = 10*UE->frame_parms.slots_per_subframe;
+ int absolute_slot=-1;
+
+ while (!oai_exit) {
+ if (!syncD->UE->is_synchronized) {
+ if (syncRunning) {
+ notifiedFIFO_elt_t *res=tryPullTpool(&nf, Tpool);
+
+ if (res) {
+ syncRunning=false;
+ } else
+ trashFrame(UE, ×tamp);
+ } else {
+ readFrame(UE, ×tamp);
+ pushTpool(Tpool, syncMsg);
+ syncRunning=true;
+ }
+
+ continue;
+ }
+
+ if (start_rx_stream==0) {
+ start_rx_stream=1;
+ syncInFrame(UE, ×tamp);
+ UE->rx_offset=0;
+ UE->time_sync_cell=0;
+ //printf("first stream frame rx %d\n",UE->proc.proc_rxtx[0].frame_rx);
+ // read in first symbol
+ AssertFatal (UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0 ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ (void **)UE->common_vars.rxdata,
+ UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0,
+ UE->frame_parms.nb_antennas_rx),"");
+ continue;
+ }
+
+ absolute_slot++;
+ thread_idx = absolute_slot % RX_NB_TH;
+ int slot_nr=absolute_slot % nb_slot_frame;
+ UE_nr_rxtx_proc_t *proc=&(((processingData_t *)NotifiedFifoData(processingMsg[thread_idx]))->proc);
+ // update thread index for received subframe
+ proc->nr_tti_rx= slot_nr;
+ UE->current_thread_id[slot_nr] = thread_idx;
+ proc->subframe_rx=table_sf_slot[slot_nr];
+ proc->nr_tti_tx = (absolute_slot + DURATION_RX_TO_TX) % nb_slot_frame;
+ proc->subframe_tx=proc->nr_tti_rx;
+ proc->frame_rx = ( absolute_slot/nb_slot_frame ) % MAX_FRAME_NUMBER;
+ proc->frame_tx = ( (absolute_slot + DURATION_RX_TO_TX) /nb_slot_frame ) % MAX_FRAME_NUMBER;
+ LOG_D(PHY,"Process slot %d thread Idx %d \n", slot_nr, thread_idx);
+
+ for (int i=0; iframe_parms.nb_antennas_rx; i++)
+ rxp[i] = (void *)&UE->common_vars.rxdata[i][UE->frame_parms.ofdm_symbol_size+
+ UE->frame_parms.nb_prefix_samples0+
+ slot_nr*UE->frame_parms.samples_per_slot];
+
+ for (int i=0; iframe_parms.nb_antennas_tx; i++)
+ txp[i] = (void *)&UE->common_vars.txdata[i][proc->nr_tti_tx*UE->frame_parms.samples_per_slot];
+
+ int readBlockSize, writeBlockSize;
+
+ if (slot_nr<(nb_slot_frame - 1)) {
+ readBlockSize=UE->frame_parms.samples_per_slot;
+ writeBlockSize=UE->frame_parms.samples_per_slot;
+ } else {
+ UE->rx_offset_diff = computeSamplesShift(UE);
+ readBlockSize=UE->frame_parms.samples_per_slot -
+ UE->frame_parms.ofdm_symbol_size -
+ UE->frame_parms.nb_prefix_samples0 -
+ UE->rx_offset_diff;
+ writeBlockSize=UE->frame_parms.samples_per_slot -
+ UE->rx_offset_diff;
+ }
+
+ AssertFatal(readBlockSize ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ rxp,
+ readBlockSize,
+ UE->frame_parms.nb_antennas_rx),"");
+ AssertFatal( writeBlockSize ==
+ UE->rfdevice.trx_write_func(&UE->rfdevice,
+ timestamp+
+ (2*UE->frame_parms.samples_per_slot) -
+ UE->frame_parms.ofdm_symbol_size-UE->frame_parms.nb_prefix_samples0 -
+ openair0_cfg[0].tx_sample_advance,
+ txp,
+ writeBlockSize,
+ UE->frame_parms.nb_antennas_tx,
+ 1),"");
+
+ if( slot_nr==(nb_slot_frame-1)) {
+ // read in first symbol of next frame and adjust for timing drift
+ int first_symbols=writeBlockSize-readBlockSize;
+
+ if ( first_symbols > 0 )
+ AssertFatal(first_symbols ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ (void **)UE->common_vars.rxdata,
+ first_symbols,
+ UE->frame_parms.nb_antennas_rx),"");
+ else
+ LOG_E(PHY,"can't compensate: diff =%d\n", first_symbols);
+ }
+
+ proc->timestamp_tx = timestamp+
+ (DURATION_RX_TO_TX*UE->frame_parms.samples_per_slot)-
+ UE->frame_parms.ofdm_symbol_size-UE->frame_parms.nb_prefix_samples0;
+
+ if (getenv("RFSIMULATOR")) {
+ // FixMe: Wait previous thread is done, because race conditions seems too bad
+ // in case of actual RF board, the overlap between threads mitigate the issue
+ while (!tryPullTpool(&nf, Tpool)) {
+ nbSlotProcessing--;
+ usleep(200);
+ }
+ }
+
+ while (nbSlotProcessing >= RX_NB_TH && !tryPullTpool(&nf, Tpool)) {
+ nbSlotProcessing--;
+ usleep(200);
+ }
+
+ pushTpool(Tpool, processingMsg[thread_idx]);
+ } // while !oai_exit
+
+ return NULL;
+}
+
+void init_UE(int nb_inst) {
+ int inst;
+ NR_UE_MAC_INST_t *mac_inst;
+ pthread_t threads[nb_inst];
+ pthread_attr_t attr;
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+ pthread_attr_setschedpolicy(&attr, SCHED_RR);
+ struct sched_param sched;
+ sched.sched_priority = sched_get_priority_max(SCHED_RR)-1;
+ pthread_attr_setschedparam(&attr, &sched);
+
+ for (inst=0; inst < nb_inst; inst++) {
+ // UE->rfdevice.type = NONE_DEV;
+ //PHY_VARS_NR_UE *UE = PHY_vars_UE_g[inst][0];
+ LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]);
+ PHY_vars_UE_g[inst][0] = init_nr_ue_vars(NULL,inst,0);
+ PHY_VARS_NR_UE *UE = PHY_vars_UE_g[inst][0];
+ AssertFatal((UE->if_inst = nr_ue_if_module_init(inst)) != NULL, "can not initial IF module\n");
+ nr_l3_init_ue();
+ nr_l2_init_ue();
+ mac_inst = get_mac_inst(0);
+ mac_inst->if_module = UE->if_inst;
+ UE->if_inst->scheduled_response = nr_ue_scheduled_response;
+ UE->if_inst->phy_config_request = nr_ue_phy_config_request;
+ LOG_I(PHY,"Intializing UE Threads for instance %d (%p,%p)...\n",inst,PHY_vars_UE_g[inst],PHY_vars_UE_g[inst][0]);
+ //init_UE_threads(inst);
+ //UE = PHY_vars_UE_g[inst][0];
+ AssertFatal(0 == pthread_create(&threads[inst],
+ &attr,
+ UE_thread,
+ (void *)UE), "");
+ }
+
+ printf("UE threads created by %ld\n", gettid());
+}
+
diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
new file mode 100644
index 0000000000..e6a97c8f28
--- /dev/null
+++ b/executables/nr-uesoftmodem.c
@@ -0,0 +1,831 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+
+#define _GNU_SOURCE /* See feature_test_macros(7) */
+#include
+
+#include "T.h"
+#include "assertions.h"
+#include "PHY/types.h"
+#include "PHY/defs_nr_UE.h"
+#include "common/ran_context.h"
+#include "common/config/config_userapi.h"
+#include "common/utils/load_module_shlib.h"
+//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
+
+#include "../../ARCH/COMMON/common_lib.h"
+#include "../../ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
+
+//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
+
+#include "PHY/phy_vars_nr_ue.h"
+#include "PHY/LTE_TRANSPORT/transport_vars.h"
+#include "SCHED/sched_common_vars.h"
+#include "PHY/MODULATION/modulation_vars.h"
+//#include "../../SIMU/USER/init_lte.h"
+
+#include "LAYER2/MAC/mac_vars.h"
+#include "LAYER2/MAC/mac_proto.h"
+#include "RRC/LTE/rrc_vars.h"
+#include "PHY_INTERFACE/phy_interface_vars.h"
+
+#ifdef SMBV
+#include "PHY/TOOLS/smbv.h"
+unsigned short config_frames[4] = {2,9,11,13};
+#endif
+#include "common/utils/LOG/log.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
+
+#include "UTIL/OPT/opt.h"
+#include "enb_config.h"
+//#include "PHY/TOOLS/time_meas.h"
+
+#ifndef OPENAIR2
+ #include "UTIL/OTG/otg_vars.h"
+#endif
+
+#include "intertask_interface.h"
+#include "create_tasks.h"
+
+#include "PHY/INIT/phy_init.h"
+#include "system.h"
+#include
+#include
+#include
+#include
+#include
+
+#ifdef XFORMS
+#include
+
+/* Callbacks, globals and object handlers */
+
+extern void reset_stats( FL_OBJECT *, long );
+
+/* Forms and Objects */
+
+typedef struct {
+ FL_FORM *stats_form;
+ void *vdata;
+ char *cdata;
+ long ldata;
+ FL_OBJECT *stats_text;
+ FL_OBJECT *stats_button;
+} FD_stats_form;
+
+extern FD_stats_form *create_form_stats_form( void );
+
+#include "PHY/TOOLS/nr_phy_scope.h"
+//#include "stats.h"
+// current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
+// at eNB 0, an UL scope for every UE
+FD_lte_phy_scope_ue *form_ue[NUMBER_OF_UE_MAX];
+//FD_lte_phy_scope_enb *form_enb[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
+//FD_stats_form *form_stats=NULL,*form_stats_l2=NULL;
+char title[255];
+//unsigned char scope_enb_num_ue = 2;
+static pthread_t forms_thread; //xforms
+#endif //XFORMS
+#include
+
+RAN_CONTEXT_t RC;
+volatile int start_eNB = 0;
+volatile int start_UE = 0;
+volatile int oai_exit = 0;
+
+static clock_source_t clock_source = internal;
+int single_thread_flag=1;
+
+int threequarter_fs=0;
+
+uint32_t downlink_frequency[MAX_NUM_CCs][4];
+int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
+
+extern int16_t nr_dlsch_demod_shift;
+
+int UE_scan = 0;
+int UE_scan_carrier = 0;
+int UE_fo_compensation = 0;
+runmode_t mode = normal_txrx;
+openair0_config_t openair0_cfg[MAX_CARDS];
+
+#if MAX_NUM_CCs == 1
+rx_gain_t rx_gain_mode[MAX_NUM_CCs][4] = {{max_gain,max_gain,max_gain,max_gain}};
+double tx_gain[MAX_NUM_CCs][4] = {{20,0,0,0}};
+double rx_gain[MAX_NUM_CCs][4] = {{110,0,0,0}};
+#else
+rx_gain_t rx_gain_mode[MAX_NUM_CCs][4] = {{max_gain,max_gain,max_gain,max_gain},{max_gain,max_gain,max_gain,max_gain}};
+double tx_gain[MAX_NUM_CCs][4] = {{20,0,0,0},{20,0,0,0}};
+double rx_gain[MAX_NUM_CCs][4] = {{110,0,0,0},{20,0,0,0}};
+#endif
+
+double rx_gain_off = 0.0;
+
+double sample_rate=30.72e6;
+double bw = 10.0e6;
+
+static int tx_max_power[MAX_NUM_CCs] = {0};
+
+char rf_config_file[1024];
+
+int chain_offset=0;
+int phy_test = 0;
+uint8_t usim_test = 0;
+
+uint8_t dci_Format = 0;
+uint8_t agregation_Level =0xFF;
+
+uint8_t nb_antenna_tx = 1;
+uint8_t nb_antenna_rx = 1;
+
+char ref[128] = "internal";
+char channels[128] = "0";
+
+char *parallel_config = NULL;
+char *worker_config = NULL;
+
+static THREAD_STRUCT thread_struct;
+void set_parallel_conf(char *parallel_conf) {
+ if(strcmp(parallel_conf,"PARALLEL_SINGLE_THREAD")==0) thread_struct.parallel_conf = PARALLEL_SINGLE_THREAD;
+ else if(strcmp(parallel_conf,"PARALLEL_RU_L1_SPLIT")==0) thread_struct.parallel_conf = PARALLEL_RU_L1_SPLIT;
+ else if(strcmp(parallel_conf,"PARALLEL_RU_L1_TRX_SPLIT")==0) thread_struct.parallel_conf = PARALLEL_RU_L1_TRX_SPLIT;
+
+ printf("[CONFIG] parallel conf is set to %d\n",thread_struct.parallel_conf);
+}
+void set_worker_conf(char *worker_conf) {
+ if(strcmp(worker_conf,"WORKER_DISABLE")==0) thread_struct.worker_conf = WORKER_DISABLE;
+ else if(strcmp(worker_conf,"WORKER_ENABLE")==0) thread_struct.worker_conf = WORKER_ENABLE;
+
+ printf("[CONFIG] worker conf is set to %d\n",thread_struct.worker_conf);
+}
+PARALLEL_CONF_t get_thread_parallel_conf(void) {
+ return thread_struct.parallel_conf;
+}
+WORKER_CONF_t get_thread_worker_conf(void) {
+ return thread_struct.worker_conf;
+}
+int rx_input_level_dBm;
+
+//static int online_log_messages=0;
+
+#ifdef XFORMS
+ extern int otg_enabled;
+ int do_forms=0;
+#else
+ int otg_enabled;
+#endif
+//int number_of_cards = 1;
+
+static NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs];
+static nfapi_nr_config_request_t *config[MAX_NUM_CCs];
+int16_t node_synch_ref[MAX_NUM_CCs];
+
+uint32_t target_dl_mcs = 28; //maximum allowed mcs
+uint32_t target_ul_mcs = 20;
+uint32_t timing_advance = 0;
+uint8_t exit_missed_slots=1;
+uint64_t num_missed_slots=0; // counter for the number of missed slots
+
+
+int transmission_mode=1;
+int numerology = 0;
+
+/* flag set by eNB conf file to specify if the radio head is local or remote (default option is local) */
+//uint8_t local_remote_radio = BBU_LOCAL_RADIO_HEAD;
+/* struct for ethernet specific parameters given in eNB conf file */
+//eth_params_t *eth_params;
+
+double cpuf;
+
+char uecap_xer[1024],uecap_xer_in=0;
+
+int oaisim_flag=0;
+int emulate_rf = 0;
+
+tpool_t *Tpool;
+
+char *usrp_args=NULL;
+char *usrp_clksrc=NULL;
+
+/* forward declarations */
+void set_default_frame_parms(NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]);
+
+
+/* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
+ * this is very hackish - find a proper solution
+ */
+uint8_t abstraction_flag=0;
+
+/*---------------------BMC: timespec helpers -----------------------------*/
+
+struct timespec min_diff_time = { .tv_sec = 0, .tv_nsec = 0 };
+struct timespec max_diff_time = { .tv_sec = 0, .tv_nsec = 0 };
+
+struct timespec clock_difftime(struct timespec start, struct timespec end) {
+ struct timespec temp;
+
+ if ((end.tv_nsec-start.tv_nsec)<0) {
+ temp.tv_sec = end.tv_sec-start.tv_sec-1;
+ temp.tv_nsec = 1000000000+end.tv_nsec-start.tv_nsec;
+ } else {
+ temp.tv_sec = end.tv_sec-start.tv_sec;
+ temp.tv_nsec = end.tv_nsec-start.tv_nsec;
+ }
+
+ return temp;
+}
+
+void print_difftimes(void) {
+ LOG_I(HW,"difftimes min = %lu ns ; max = %lu ns\n", min_diff_time.tv_nsec, max_diff_time.tv_nsec);
+}
+
+void exit_function(const char *file, const char *function, const int line, const char *s) {
+ int CC_id;
+
+ if (s != NULL) {
+ printf("%s:%d %s() Exiting OAI softmodem: %s\n",file,line, function, s);
+ }
+
+ oai_exit = 1;
+
+ if (PHY_vars_UE_g && PHY_vars_UE_g[0]) {
+ for(CC_id=0; CC_idrfdevice.trx_end_func)
+ PHY_vars_UE_g[0][CC_id]->rfdevice.trx_end_func(&PHY_vars_UE_g[0][CC_id]->rfdevice);
+ }
+ }
+
+ sleep(1); //allow lte-softmodem threads to exit first
+ itti_terminate_tasks (TASK_UNKNOWN);
+}
+
+#ifdef XFORMS
+
+
+void reset_stats(FL_OBJECT *button, long arg) {
+ //int i,j,k;
+ /*PHY_VARS_eNB *phy_vars_eNB = PHY_vars_eNB_g[0][0];
+
+ for (i=0; idlsch[i][0]->Mlimit; j++) {
+ phy_vars_eNB->UE_stats[i].dlsch_NAK[k][j]=0;
+ phy_vars_eNB->UE_stats[i].dlsch_ACK[k][j]=0;
+ phy_vars_eNB->UE_stats[i].dlsch_trials[k][j]=0;
+ }
+
+ phy_vars_eNB->UE_stats[i].dlsch_l2_errors[k]=0;
+ phy_vars_eNB->UE_stats[i].ulsch_errors[k]=0;
+ phy_vars_eNB->UE_stats[i].ulsch_consecutive_errors=0;
+
+ for (j=0; julsch[i]->Mlimit; j++) {
+ phy_vars_eNB->UE_stats[i].ulsch_decoding_attempts[k][j]=0;
+ phy_vars_eNB->UE_stats[i].ulsch_decoding_attempts_last[k][j]=0;
+ phy_vars_eNB->UE_stats[i].ulsch_round_errors[k][j]=0;
+ phy_vars_eNB->UE_stats[i].ulsch_round_fer[k][j]=0;
+ }
+ }
+
+ phy_vars_eNB->UE_stats[i].dlsch_sliding_cnt=0;
+ phy_vars_eNB->UE_stats[i].dlsch_NAK_round0=0;
+ phy_vars_eNB->UE_stats[i].dlsch_mcs_offset=0;
+ }*/
+}
+
+static void *scope_thread(void *arg) {
+ struct sched_param sched_param;
+ sched_param.sched_priority = sched_get_priority_min(SCHED_FIFO)+1;
+ sched_setscheduler(0, SCHED_FIFO,&sched_param);
+ printf("Scope thread has priority %d\n",sched_param.sched_priority);
+ //wait the modem is runnign
+ sleep(5);
+
+ while (!oai_exit) {
+ phy_scope_UE(form_ue[0],
+ PHY_vars_UE_g[0][0],
+ 0,0,1);
+ usleep(100*1000);
+ }
+
+ pthread_exit((void *)arg);
+}
+#endif
+
+void init_scope(void) {
+#ifdef XFORMS
+ int ret;
+ int fl_argc=1;
+
+ if (do_forms==1) {
+ char *name="5G-UE-scope";
+ fl_initialize (&fl_argc, &name, NULL, 0, 0);
+ int UE_id = 0;
+ form_ue[UE_id] = create_lte_phy_scope_ue();
+ sprintf (title, "NR DL SCOPE UE");
+ fl_show_form (form_ue[UE_id]->lte_phy_scope_ue, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
+ fl_set_button(form_ue[UE_id]->button_0,0);
+ fl_set_object_label(form_ue[UE_id]->button_0, "IA Receiver OFF");
+ ret = pthread_create(&forms_thread, NULL, scope_thread, NULL);
+
+ if (ret == 0)
+ pthread_setname_np( forms_thread, "xforms" );
+
+ printf("Scope thread created, ret=%d\n",ret);
+ }
+
+#endif
+}
+
+
+#if defined(ENABLE_ITTI)
+void *l2l1_task(void *arg) {
+ MessageDef *message_p = NULL;
+ int result;
+ itti_set_task_real_time(TASK_L2L1);
+ itti_mark_task_ready(TASK_L2L1);
+
+ do {
+ // Wait for a message
+ itti_receive_msg (TASK_L2L1, &message_p);
+
+ switch (ITTI_MSG_ID(message_p)) {
+ case TERMINATE_MESSAGE:
+ oai_exit=1;
+ itti_exit_task ();
+ break;
+
+ case ACTIVATE_MESSAGE:
+ start_UE = 1;
+ break;
+
+ case DEACTIVATE_MESSAGE:
+ start_UE = 0;
+ break;
+
+ case MESSAGE_TEST:
+ LOG_I(EMU, "Received %s\n", ITTI_MSG_NAME(message_p));
+ break;
+
+ default:
+ LOG_E(EMU, "Received unexpected message %s\n", ITTI_MSG_NAME(message_p));
+ break;
+ }
+
+ result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
+ AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
+ } while(!oai_exit);
+
+ return NULL;
+}
+#endif
+
+int16_t dlsch_demod_shift;
+
+static void get_options(void) {
+ int CC_id;
+ int tddflag=0, nonbiotflag;
+ char *loopfile=NULL;
+ int dumpframe=0;
+ uint32_t online_log_messages;
+ uint32_t glog_level, glog_verbosity;
+ uint32_t start_telnetsrv=0;
+ paramdef_t cmdline_params[] =CMDLINE_PARAMS_DESC ;
+ paramdef_t cmdline_logparams[] =CMDLINE_LOGPARAMS_DESC ;
+ config_process_cmdline( cmdline_params,sizeof(cmdline_params)/sizeof(paramdef_t),NULL);
+
+ if (strlen(in_path) > 0) {
+ opt_type = OPT_PCAP;
+ opt_enabled=1;
+ printf("Enabling OPT for PCAP with the following file %s \n",in_path);
+ }
+
+ if (strlen(in_ip) > 0) {
+ opt_enabled=1;
+ opt_type = OPT_WIRESHARK;
+ printf("Enabling OPT for wireshark for local interface");
+ }
+
+ config_process_cmdline( cmdline_logparams,sizeof(cmdline_logparams)/sizeof(paramdef_t),NULL);
+
+ if(config_isparamset(cmdline_logparams,CMDLINE_ONLINELOG_IDX)) {
+ set_glog_onlinelog(online_log_messages);
+ }
+
+ if(config_isparamset(cmdline_logparams,CMDLINE_GLOGLEVEL_IDX)) {
+ set_glog(glog_level);
+ }
+
+ if (start_telnetsrv) {
+ load_module_shlib("telnetsrv",NULL,0,NULL);
+ }
+
+ paramdef_t cmdline_uemodeparams[] =CMDLINE_UEMODEPARAMS_DESC;
+ paramdef_t cmdline_ueparams[] =CMDLINE_UEPARAMS_DESC;
+ config_process_cmdline( cmdline_uemodeparams,sizeof(cmdline_uemodeparams)/sizeof(paramdef_t),NULL);
+ config_process_cmdline( cmdline_ueparams,sizeof(cmdline_ueparams)/sizeof(paramdef_t),NULL);
+
+ if ( (cmdline_uemodeparams[CMDLINE_CALIBUERX_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = rx_calib_ue;
+
+ if ( (cmdline_uemodeparams[CMDLINE_CALIBUERXMED_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = rx_calib_ue_med;
+
+ if ( (cmdline_uemodeparams[CMDLINE_CALIBUERXBYP_IDX].paramflags & PARAMFLAG_PARAMSET) != 0) mode = rx_calib_ue_byp;
+
+ if (cmdline_uemodeparams[CMDLINE_DEBUGUEPRACH_IDX].uptr)
+ if ( *(cmdline_uemodeparams[CMDLINE_DEBUGUEPRACH_IDX].uptr) > 0) mode = debug_prach;
+
+ if (cmdline_uemodeparams[CMDLINE_NOL2CONNECT_IDX].uptr)
+ if ( *(cmdline_uemodeparams[CMDLINE_NOL2CONNECT_IDX].uptr) > 0) mode = no_L2_connect;
+
+ if (cmdline_uemodeparams[CMDLINE_CALIBPRACHTX_IDX].uptr)
+ if ( *(cmdline_uemodeparams[CMDLINE_CALIBPRACHTX_IDX].uptr) > 0) mode = calib_prach_tx;
+
+ if (dumpframe > 0) mode = rx_dump_frame;
+
+ for (CC_id=0; CC_iddl_CarrierFreq = downlink_frequency[0][0];
+ }
+
+ UE_scan=0;
+
+ if (tddflag > 0) {
+ for (CC_id=0; CC_idframe_type = TDD;
+ }
+
+ /*if (frame_parms[0]->N_RB_DL !=0) {
+ if ( frame_parms[0]->N_RB_DL < 6 ) {
+ frame_parms[0]->N_RB_DL = 6;
+ printf ( "%i: Invalid number of ressource blocks, adjusted to 6\n",frame_parms[0]->N_RB_DL);
+ }
+ if ( frame_parms[0]->N_RB_DL > 100 ) {
+ frame_parms[0]->N_RB_DL = 100;
+ printf ( "%i: Invalid number of ressource blocks, adjusted to 100\n",frame_parms[0]->N_RB_DL);
+ }
+ if ( frame_parms[0]->N_RB_DL > 50 && frame_parms[0]->N_RB_DL < 100 ) {
+ frame_parms[0]->N_RB_DL = 50;
+ printf ( "%i: Invalid number of ressource blocks, adjusted to 50\n",frame_parms[0]->N_RB_DL);
+ }
+ if ( frame_parms[0]->N_RB_DL > 25 && frame_parms[0]->N_RB_DL < 50 ) {
+ frame_parms[0]->N_RB_DL = 25;
+ printf ( "%i: Invalid number of ressource blocks, adjusted to 25\n",frame_parms[0]->N_RB_DL);
+ }
+ UE_scan = 0;
+ frame_parms[0]->N_RB_UL=frame_parms[0]->N_RB_DL;
+ for (CC_id=1; CC_idN_RB_DL=frame_parms[0]->N_RB_DL;
+ frame_parms[CC_id]->N_RB_UL=frame_parms[0]->N_RB_UL;
+ }
+ }*/
+
+ for (CC_id=1; CC_idsubframe_config.numerology_index_mu.value =1;
+ config[CC_id]->subframe_config.duplex_mode.value = 1; //FDD
+ config[CC_id]->subframe_config.dl_cyclic_prefix_type.value = 0; //NORMAL
+ config[CC_id]->rf_config.dl_carrier_bandwidth.value = 106;
+ config[CC_id]->rf_config.ul_carrier_bandwidth.value = 106;
+ config[CC_id]->sch_config.physical_cell_id.value = 0;
+
+ frame_parms[CC_id]->eutra_band = 78;
+ frame_parms[CC_id]->frame_type = FDD;
+ frame_parms[CC_id]->tdd_config = 3;
+ //frame_parms[CC_id]->tdd_config_S = 0;
+ frame_parms[CC_id]->N_RB_DL = 106;
+ frame_parms[CC_id]->N_RB_UL = 106;
+ frame_parms[CC_id]->Ncp = NORMAL;
+ //frame_parms[CC_id]->Ncp_UL = NORMAL;
+ frame_parms[CC_id]->Nid_cell = 0;
+ //frame_parms[CC_id]->num_MBSFN_config = 0;
+ frame_parms[CC_id]->nb_antenna_ports_eNB = 1;
+ frame_parms[CC_id]->nb_antennas_tx = 1;
+ frame_parms[CC_id]->nb_antennas_rx = 1;
+ //frame_parms[CC_id]->nushift = 0;
+ ///frame_parms[CC_id]->phich_config_common.phich_resource = oneSixth;
+ //frame_parms[CC_id]->phich_config_common.phich_duration = normal;
+ // UL RS Config
+ /*frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = 1;//n_DMRS1 set to 0
+ frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = 1;
+ frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = 0;
+ frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = 0;
+
+ frame_parms[CC_id]->pusch_config_common.n_SB = 1;
+ frame_parms[CC_id]->pusch_config_common.hoppingMode = 0;
+ frame_parms[CC_id]->pusch_config_common.pusch_HoppingOffset = 0;
+ frame_parms[CC_id]->pusch_config_common.enable64QAM = 0;
+
+ frame_parms[CC_id]->prach_config_common.rootSequenceIndex=22;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig=1;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_ConfigIndex=0;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.highSpeedFlag=0;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_FreqOffset=0;*/
+ // NR: Init to legacy LTE 20Mhz params
+ frame_parms[CC_id]->numerology_index = 0;
+ frame_parms[CC_id]->ttis_per_subframe = 1;
+ frame_parms[CC_id]->slots_per_tti = 2;
+ }
+}
+
+void init_openair0(void) {
+ int card;
+ int i;
+
+ for (card=0; cardN_RB_DL == 106) {
+ if (numerology==0) {
+ if (frame_parms[0]->threequarter_fs) {
+ openair0_cfg[card].sample_rate=23.04e6;
+ openair0_cfg[card].samples_per_frame = 230400;
+ openair0_cfg[card].tx_bw = 10e6;
+ openair0_cfg[card].rx_bw = 10e6;
+ } else {
+ openair0_cfg[card].sample_rate=30.72e6;
+ openair0_cfg[card].samples_per_frame = 307200;
+ openair0_cfg[card].tx_bw = 10e6;
+ openair0_cfg[card].rx_bw = 10e6;
+ }
+ } else if (numerology==1) {
+ openair0_cfg[card].sample_rate=61.44e6;
+ openair0_cfg[card].samples_per_frame = 307200;
+ openair0_cfg[card].tx_bw = 20e6;
+ openair0_cfg[card].rx_bw = 20e6;
+ } else if (numerology==2) {
+ openair0_cfg[card].sample_rate=122.88e6;
+ openair0_cfg[card].samples_per_frame = 307200;
+ openair0_cfg[card].tx_bw = 40e6;
+ openair0_cfg[card].rx_bw = 40e6;
+ } else {
+ LOG_E(PHY,"Unsupported numerology!\n");
+ exit(-1);
+ }
+ } else if(frame_parms[0]->N_RB_DL == 50) {
+ openair0_cfg[card].sample_rate=15.36e6;
+ openair0_cfg[card].samples_per_frame = 153600;
+ openair0_cfg[card].tx_bw = 5e6;
+ openair0_cfg[card].rx_bw = 5e6;
+ } else if (frame_parms[0]->N_RB_DL == 25) {
+ openair0_cfg[card].sample_rate=7.68e6;
+ openair0_cfg[card].samples_per_frame = 76800;
+ openair0_cfg[card].tx_bw = 2.5e6;
+ openair0_cfg[card].rx_bw = 2.5e6;
+ } else if (frame_parms[0]->N_RB_DL == 6) {
+ openair0_cfg[card].sample_rate=1.92e6;
+ openair0_cfg[card].samples_per_frame = 19200;
+ openair0_cfg[card].tx_bw = 1.5e6;
+ openair0_cfg[card].rx_bw = 1.5e6;
+ }
+
+ if (frame_parms[0]->frame_type==TDD)
+ openair0_cfg[card].duplex_mode = duplex_mode_TDD;
+ else //FDD
+ openair0_cfg[card].duplex_mode = duplex_mode_FDD;
+
+ printf("HW: Configuring card %d, nb_antennas_tx/rx %d/%d\n",card,
+ PHY_vars_UE_g[0][0]->frame_parms.nb_antennas_tx,
+ PHY_vars_UE_g[0][0]->frame_parms.nb_antennas_rx);
+ openair0_cfg[card].Mod_id = 0;
+ openair0_cfg[card].num_rb_dl=frame_parms[0]->N_RB_DL;
+ openair0_cfg[card].clock_source = clock_source;
+ openair0_cfg[card].tx_num_channels=min(2,PHY_vars_UE_g[0][0]->frame_parms.nb_antennas_tx);
+ openair0_cfg[card].rx_num_channels=min(2,PHY_vars_UE_g[0][0]->frame_parms.nb_antennas_rx);
+
+ for (i=0; i<4; i++) {
+ if (irx_total_gain_dB - rx_gain_off;
+ openair0_cfg[card].configFilename = rf_config_file;
+ printf("Card %d, channel %d, Setting tx_gain %f, rx_gain %f, tx_freq %f, rx_freq %f\n",
+ card,i, openair0_cfg[card].tx_gain[i],
+ openair0_cfg[card].rx_gain[i],
+ openair0_cfg[card].tx_freq[i],
+ openair0_cfg[card].rx_freq[i]);
+ }
+
+ if (usrp_args) openair0_cfg[card].sdr_addrs = usrp_args;
+
+ if (usrp_clksrc) {
+ if (strcmp(usrp_clksrc, "internal") == 0) {
+ openair0_cfg[card].clock_source = internal;
+ LOG_D(PHY, "USRP clock source set as internal\n");
+ } else if (strcmp(usrp_clksrc, "external") == 0) {
+ openair0_cfg[card].clock_source = external;
+ LOG_D(PHY, "USRP clock source set as external\n");
+ } else if (strcmp(usrp_clksrc, "gpsdo") == 0) {
+ openair0_cfg[card].clock_source = gpsdo;
+ LOG_D(PHY, "USRP clock source set as gpsdo\n");
+ } else {
+ openair0_cfg[card].clock_source = internal;
+ LOG_I(PHY, "USRP clock source unknown ('%s'). defaulting to internal\n", usrp_clksrc);
+ }
+ } else {
+ openair0_cfg[card].clock_source = internal;
+ LOG_I(PHY, "USRP clock source not specified. defaulting to internal\n");
+ }
+ }
+}
+
+
+int main( int argc, char **argv ) {
+ //uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
+ PHY_VARS_NR_UE *UE[MAX_NUM_CCs];
+ start_background_system();
+
+ if ( load_configmodule(argc,argv) == NULL) {
+ exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
+ }
+
+ CONFIG_SETRTFLAG(CONFIG_NOEXITONHELP);
+ set_default_frame_parms(frame_parms);
+ mode = normal_txrx;
+ memset(openair0_cfg,0,sizeof(openair0_config_t)*MAX_CARDS);
+ memset(tx_max_power,0,sizeof(int)*MAX_NUM_CCs);
+ // initialize logging
+ logInit();
+ // get options and fill parameters from configuration file
+ get_options (); //Command-line options, enb_properties
+#if T_TRACER
+ T_Config_Init();
+#endif
+ //randominit (0);
+ set_taus_seed (0);
+ tpool_t pool;
+ Tpool = &pool;
+ char params[]="-1,-1,-1,-1";
+ initTpool(params, Tpool, false);
+ cpuf=get_cpu_freq_GHz();
+ itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+
+ if (opt_type != OPT_NONE) {
+ if (init_opt(in_path, in_ip) == -1)
+ LOG_E(OPT,"failed to run OPT \n");
+ }
+
+#ifdef PDCP_USE_NETLINK
+ netlink_init();
+#if defined(PDCP_USE_NETLINK_QUEUES)
+ pdcp_netlink_init();
+#endif
+#endif
+#ifndef PACKAGE_VERSION
+# define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
+#endif
+ LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
+
+ // init the parameters
+ for (int CC_id=0; CC_idnb_antennas_tx = nb_antenna_tx;
+ frame_parms[CC_id]->nb_antennas_rx = nb_antenna_rx;
+ frame_parms[CC_id]->nb_antenna_ports_eNB = 1; //initial value overwritten by initial sync later
+ LOG_I(PHY,"Set nb_rx_antenna %d , nb_tx_antenna %d \n",frame_parms[CC_id]->nb_antennas_rx, frame_parms[CC_id]->nb_antennas_tx);
+
+ get_band(downlink_frequency[CC_id][0], &frame_parms[CC_id]->eutra_band, &uplink_frequency_offset[CC_id][0], &frame_parms[CC_id]->frame_type);
+
+ }
+
+ NB_UE_INST=1;
+ NB_INST=1;
+ PHY_vars_UE_g = malloc(sizeof(PHY_VARS_NR_UE **));
+ PHY_vars_UE_g[0] = malloc(sizeof(PHY_VARS_NR_UE *)*MAX_NUM_CCs);
+
+ for (int CC_id=0; CC_idofdm_symbol_size);
+ nr_init_frame_parms_ue(frame_parms[CC_id],numerology,NORMAL,frame_parms[CC_id]->N_RB_DL,(frame_parms[CC_id]->N_RB_DL-20)>>1,0);
+ PHY_vars_UE_g[0][CC_id] = init_nr_ue_vars(frame_parms[CC_id], 0,abstraction_flag);
+ UE[CC_id] = PHY_vars_UE_g[0][CC_id];
+
+ if (phy_test==1)
+ UE[CC_id]->mac_enabled = 0;
+ else
+ UE[CC_id]->mac_enabled = 1;
+
+ if (UE[CC_id]->mac_enabled == 0) { //set default UL parameters for testing mode
+ for (int i=0; ipusch_config_dedicated[i] = malloc(sizeof(PUSCH_CONFIG_DEDICATED));
+ //UE[CC_id]->scheduling_request_config[i] = malloc(sizeof(SCHEDULING_REQUEST_CONFIG));
+ /*UE[CC_id]->pusch_config_dedicated[i].betaOffset_ACK_Index = beta_ACK;
+ UE[CC_id]->pusch_config_dedicated[i].betaOffset_RI_Index = beta_RI;
+ UE[CC_id]->pusch_config_dedicated[i].betaOffset_CQI_Index = beta_CQI;
+
+ UE[CC_id]->scheduling_request_config[i].sr_PUCCH_ResourceIndex = 0;
+ UE[CC_id]->scheduling_request_config[i].sr_ConfigIndex = 7+(0%3);
+ UE[CC_id]->scheduling_request_config[i].dsr_TransMax = sr_n4;*/
+ }
+ }
+
+ UE[CC_id]->UE_scan = UE_scan;
+ UE[CC_id]->UE_scan_carrier = UE_scan_carrier;
+ UE[CC_id]->UE_fo_compensation = UE_fo_compensation;
+ UE[CC_id]->mode = mode;
+ printf("UE[%d]->mode = %d\n",CC_id,mode);
+
+ for (uint8_t i=0; imac_enabled == 1)
+ UE[CC_id]->pdcch_vars[i][0]->crnti = 0x1234;
+ else
+ UE[CC_id]->pdcch_vars[i][0]->crnti = 0x1235;
+ }
+
+ UE[CC_id]->rx_total_gain_dB = (int)rx_gain[CC_id][0] + rx_gain_off;
+ UE[CC_id]->tx_power_max_dBm = tx_max_power[CC_id];
+
+ if (frame_parms[CC_id]->frame_type==FDD) {
+ UE[CC_id]->N_TA_offset = 0;
+ } else {
+ if (frame_parms[CC_id]->N_RB_DL == 100)
+ UE[CC_id]->N_TA_offset = 624;
+ else if (frame_parms[CC_id]->N_RB_DL == 50)
+ UE[CC_id]->N_TA_offset = 624/2;
+ else if (frame_parms[CC_id]->N_RB_DL == 25)
+ UE[CC_id]->N_TA_offset = 624/4;
+ }
+ }
+
+ // printf("tx_max_power = %d -> amp %d\n",tx_max_power[0],get_tx_amp(tx_max_poHwer,tx_max_power));
+ init_openair0();
+ // init UE_PF_PO and mutex lock
+ pthread_mutex_init(&ue_pf_po_mutex, NULL);
+ memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*NUMBER_OF_UE_MAX*MAX_NUM_CCs);
+ mlockall(MCL_CURRENT | MCL_FUTURE);
+ init_scope();
+ number_of_cards = 1;
+
+ for(int CC_id=0; CC_idrf_map.card=0;
+ PHY_vars_UE_g[0][CC_id]->rf_map.chain=CC_id+chain_offset;
+#if defined(OAI_USRP) || defined(OAI_ADRV9371_ZC706)
+ PHY_vars_UE_g[0][CC_id]->hw_timing_advance = timing_advance;
+#else
+ PHY_vars_UE_g[0][CC_id]->hw_timing_advance = 160;
+#endif
+ }
+
+ // wait for end of program
+ printf("TYPE TO TERMINATE\n");
+ init_UE(1);
+
+ while(true)
+ sleep(3600);
+
+ return 0;
+}
diff --git a/executables/nr-uesoftmodem.h b/executables/nr-uesoftmodem.h
new file mode 100644
index 0000000000..df6b2f7282
--- /dev/null
+++ b/executables/nr-uesoftmodem.h
@@ -0,0 +1,246 @@
+#ifndef NR_UESOFTMODEM_H
+#define NR_UESOFTMODEM_H
+
+#define _GNU_SOURCE
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include "../../ARCH/COMMON/common_lib.h"
+#undef MALLOC
+#include "assertions.h"
+#include "PHY/types.h"
+#include "PHY/defs_nr_UE.h"
+#include "SIMULATION/ETH_TRANSPORT/proto.h"
+#include
+
+
+#if defined(ENABLE_ITTI)
+ #if defined(ENABLE_USE_MME)
+ #include "s1ap_eNB.h"
+ #ifdef PDCP_USE_NETLINK
+ #include "SIMULATION/ETH_TRANSPORT/proto.h"
+ #endif
+ #endif
+#endif
+
+/* help strings definition for command line options, used in CMDLINE_XXX_DESC macros and printed when -h option is used */
+#define CONFIG_HLP_RFCFGF "Configuration file for front-end (e.g. LMS7002M)\n"
+#define CONFIG_HLP_ULMAXE "set the eNodeB max ULSCH erros\n"
+#define CONFIG_HLP_CALUER "set UE RX calibration\n"
+#define CONFIG_HLP_CALUERM ""
+#define CONFIG_HLP_CALUERB ""
+#define CONFIG_HLP_DBGUEPR "UE run normal prach power ramping, but don't continue random-access\n"
+#define CONFIG_HLP_CALPRACH "UE run normal prach with maximum power, but don't continue random-access\n"
+#define CONFIG_HLP_NOL2CN "bypass L2 and upper layers\n"
+#define CONFIG_HLP_UERXG "set UE RX gain\n"
+#define CONFIG_HLP_UERXGOFF "external UE amplifier offset\n"
+#define CONFIG_HLP_UETXG "set UE TX gain\n"
+#define CONFIG_HLP_UENANTR "set UE number of rx antennas\n"
+#define CONFIG_HLP_UENANTT "set UE number of tx antennas\n"
+#define CONFIG_HLP_UESCAN "set UE to scan around carrier\n"
+#define CONFIG_HLP_UEFO "set UE to enable estimation and compensation of frequency offset\n"
+#define CONFIG_HLP_DUMPFRAME "dump UE received frame to rxsig_frame0.dat and exit\n"
+#define CONFIG_HLP_DLSHIFT "dynamic shift for LLR compuation for TM3/4 (default 0)\n"
+#define CONFIG_HLP_UELOOP "get softmodem (UE) to loop through memory instead of acquiring from HW\n"
+#define CONFIG_HLP_PHYTST "test UE phy layer, mac disabled\n"
+#define CONFIG_HLP_DMAMAP "sets flag for improved EXMIMO UE performance\n"
+#define CONFIG_HLP_EXCCLK "tells hardware to use an external clock reference\n"
+#define CONFIG_HLP_USIM "use XOR autentication algo in case of test usim mode\n"
+#define CONFIG_HLP_NOSNGLT "Disables single-thread mode in lte-softmodem\n"
+#define CONFIG_HLP_TADV "Set timing_advance\n"
+#define CONFIG_HLP_DLF "Set the downlink frequency for all component carriers\n"
+#define CONFIG_HLP_CHOFF "Channel id offset\n"
+#define CONFIG_HLP_SOFTS "Enable soft scope and L1 and L2 stats (Xforms)\n"
+#define CONFIG_HLP_EXMCAL "Calibrate the EXMIMO borad, available files: exmimo2_2arxg.lime exmimo2_2brxg.lime \n"
+#define CONFIG_HLP_ITTIL "Generate ITTI analyzser logs (similar to wireshark logs but with more details)\n"
+#define CONFIG_HLP_DLMCS "Set the maximum downlink MCS\n"
+#define CONFIG_HLP_STMON "Enable processing timing measurement of lte softmodem on per subframe basis \n"
+#define CONFIG_HLP_PRB "Set the PRB, valid values: 6, 25, 50, 100 \n"
+#define CONFIG_HLP_MSLOTS "Skip the missed slots/subframes \n"
+#define CONFIG_HLP_ULMCS "Set the maximum uplink MCS\n"
+#define CONFIG_HLP_TDD "Set hardware to TDD mode (default: FDD). Used only with -U (otherwise set in config file).\n"
+#define CONFIG_HLP_UE "Set the lte softmodem as a UE\n"
+#define CONFIG_HLP_L2MONW "Enable L2 wireshark messages on localhost \n"
+#define CONFIG_HLP_L2MONP "Enable L2 pcap messages on localhost \n"
+#define CONFIG_HLP_VCD "Enable VCD (generated file will is named openair_dump_eNB.vcd, read it with target/RT/USER/eNB.gtkw\n"
+#define CONFIG_HLP_TQFS "Apply three-quarter of sampling frequency, 23.04 Msps to reduce the data rate on USB/PCIe transfers (only valid for 20 MHz)\n"
+#define CONFIG_HLP_TPORT "tracer port\n"
+#define CONFIG_HLP_NOTWAIT "don't wait for tracer, start immediately\n"
+#define CONFIG_HLP_TNOFORK "to ease debugging with gdb\n"
+
+#define CONFIG_HLP_NUMEROLOGY "adding numerology for 5G\n"
+#define CONFIG_HLP_EMULATE_RF "Emulated RF enabled(disable by defult)\n"
+#define CONFIG_HLP_PARALLEL_CMD "three config for level of parallelism 'PARALLEL_SINGLE_THREAD', 'PARALLEL_RU_L1_SPLIT', or 'PARALLEL_RU_L1_TRX_SPLIT'\n"
+#define CONFIG_HLP_WORKER_CMD "two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'\n"
+
+#define CONFIG_HLP_DISABLNBIOT "disable nb-iot, even if defined in config\n"
+
+#define CONFIG_HLP_USRP_ARGS "set the arguments to identify USRP (same syntax as in UHD)\n"
+#define CONFIG_HLP_USRP_CLK_SRC "USRP clock source: 'internal' or 'external'\n"
+
+/***************************************************************************************************************************************/
+/* command line options definitions, CMDLINE_XXXX_DESC macros are used to initialize paramdef_t arrays which are then used as argument
+ when calling config_get or config_getlist functions */
+
+
+/*------------------------------------------------------------------------------------------------------------------------------------------*/
+/* command line parameters defining UE running mode */
+/* optname helpstr paramflags XXXptr defXXXval type numelt */
+/*------------------------------------------------------------------------------------------------------------------------------------------*/
+#define CMDLINE_UEMODEPARAMS_DESC { \
+ {"calib-ue-rx", CONFIG_HLP_CALUER, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
+ {"calib-ue-rx-med", CONFIG_HLP_CALUERM, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
+ {"calib-ue-rx-byp", CONFIG_HLP_CALUERB, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
+ {"debug-ue-prach", CONFIG_HLP_DBGUEPR, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
+ {"no-L2-connect", CONFIG_HLP_NOL2CN, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
+ {"calib-prach-tx", CONFIG_HLP_CALPRACH, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
+ {"loop-memory", CONFIG_HLP_UELOOP, 0, strptr:&loopfile, defstrval:"iqs.in", TYPE_STRING,0}, \
+ {"ue-dump-frame", CONFIG_HLP_DUMPFRAME, PARAMFLAG_BOOL, iptr:&dumpframe, defintval:0, TYPE_INT, 0}, \
+ }
+#define CMDLINE_CALIBUERX_IDX 0
+#define CMDLINE_CALIBUERXMED_IDX 1
+#define CMDLINE_CALIBUERXBYP_IDX 2
+#define CMDLINE_DEBUGUEPRACH_IDX 3
+#define CMDLINE_NOL2CONNECT_IDX 4
+#define CMDLINE_CALIBPRACHTX_IDX 5
+#define CMDLINE_MEMLOOP_IDX 6
+#define CMDLINE_DUMPMEMORY_IDX 7
+/*------------------------------------------------------------------------------------------------------------------------------------------*/
+
+
+/*--------------------------------------------------------------------------------------------------------------------------------------------------*/
+/* command line parameters specific to UE */
+/* optname helpstr paramflags XXXptr defXXXval type numelt */
+/*--------------------------------------------------------------------------------------------------------------------------------------------------*/
+#define CMDLINE_UEPARAMS_DESC { \
+ {"ue-rxgain", CONFIG_HLP_UERXG, 0, dblptr:&(rx_gain[0][0]), defdblval:0, TYPE_DOUBLE, 0}, \
+ {"ue-rxgain-off", CONFIG_HLP_UERXGOFF, 0, dblptr:&rx_gain_off, defdblval:0, TYPE_DOUBLE, 0}, \
+ {"ue-txgain", CONFIG_HLP_UETXG, 0, dblptr:&(tx_gain[0][0]), defdblval:0, TYPE_DOUBLE, 0}, \
+ {"ue-nb-ant-rx", CONFIG_HLP_UENANTR, 0, u8ptr:&nb_antenna_rx, defuintval:1, TYPE_UINT8, 0}, \
+ {"ue-nb-ant-tx", CONFIG_HLP_UENANTT, 0, u8ptr:&nb_antenna_tx, defuintval:1, TYPE_UINT8, 0}, \
+ {"ue-scan-carrier", CONFIG_HLP_UESCAN, PARAMFLAG_BOOL, iptr:&UE_scan_carrier, defintval:0, TYPE_INT, 0}, \
+ {"ue-fo-compensation", CONFIG_HLP_UEFO, PARAMFLAG_BOOL, iptr:&UE_fo_compensation, defintval:0, TYPE_INT, 0}, \
+ {"ue-max-power", NULL, 0, iptr:&(tx_max_power[0]), defintval:90, TYPE_INT, 0}, \
+ {"r" , CONFIG_HLP_PRB, 0, iptr:&(frame_parms[0]->N_RB_DL), defintval:25, TYPE_UINT, 0}, \
+ {"dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
+ {"usrp-args", CONFIG_HLP_USRP_ARGS, 0, strptr:(char **)&usrp_args, defstrval:"type=b200", TYPE_STRING, 0}, \
+ {"usrp-clksrc", CONFIG_HLP_USRP_CLK_SRC,0, strptr:(char **)&usrp_clksrc, defstrval:"internal", TYPE_STRING, 0} \
+ }
+
+#define DEFAULT_DLF 2680000000
+
+/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+/* command line parameters common to eNodeB and UE */
+/* optname helpstr paramflags XXXptr defXXXval type numelt */
+/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+#define CMDLINE_PARAMS_DESC { \
+ {"rf-config-file", CONFIG_HLP_RFCFGF, 0, strptr:(char **)&rf_config_file, defstrval:NULL, TYPE_STRING, sizeof(rf_config_file)}, \
+ {"ulsch-max-errors", CONFIG_HLP_ULMAXE, 0, uptr:&ULSCH_max_consecutive_errors, defuintval:0, TYPE_UINT, 0}, \
+ {"phy-test", CONFIG_HLP_PHYTST, PARAMFLAG_BOOL, iptr:&phy_test, defintval:0, TYPE_INT, 0}, \
+ {"usim-test", CONFIG_HLP_USIM, PARAMFLAG_BOOL, u8ptr:&usim_test, defintval:0, TYPE_UINT8, 0}, \
+ {"external-clock", CONFIG_HLP_EXCCLK, PARAMFLAG_BOOL, uptr:&clock_source, defintval:0, TYPE_INT, 0}, \
+ {"single-thread-disable", CONFIG_HLP_NOSNGLT, PARAMFLAG_BOOL, iptr:&single_thread_flag, defintval:1, TYPE_INT, 0}, \
+ {"nr-dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&nr_dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
+ {"A" , CONFIG_HLP_TADV, 0, uptr:&timing_advance, defintval:0, TYPE_UINT, 0}, \
+ {"C" , CONFIG_HLP_DLF, 0, uptr:&(downlink_frequency[0][0]), defuintval:2680000000, TYPE_UINT, 0}, \
+ {"a" , CONFIG_HLP_CHOFF, 0, iptr:&chain_offset, defintval:0, TYPE_INT, 0}, \
+ {"d" , CONFIG_HLP_SOFTS, PARAMFLAG_BOOL, iptr:&do_forms, defintval:0, TYPE_INT, 0}, \
+ {"E" , CONFIG_HLP_TQFS, PARAMFLAG_BOOL, iptr:&threequarter_fs, defintval:0, TYPE_INT, 0}, \
+ {"m" , CONFIG_HLP_DLMCS, 0, uptr:&target_dl_mcs, defintval:0, TYPE_UINT, 0}, \
+ {"t" , CONFIG_HLP_ULMCS, 0, uptr:&target_ul_mcs, defintval:0, TYPE_UINT, 0}, \
+ {"W" , CONFIG_HLP_L2MONW, 0, strptr:(char **)&in_ip, defstrval:"127.0.0.1", TYPE_STRING, sizeof(in_ip)}, \
+ {"P" , CONFIG_HLP_L2MONP, 0, strptr:(char **)&in_path, defstrval:"/tmp/oai_opt.pcap", TYPE_STRING, sizeof(in_path)}, \
+ {"q" , CONFIG_HLP_STMON, PARAMFLAG_BOOL, iptr:&opp_enabled, defintval:0, TYPE_INT, 0}, \
+ {"S" , CONFIG_HLP_MSLOTS, PARAMFLAG_BOOL, u8ptr:&exit_missed_slots, defintval:1, TYPE_UINT8, 0}, \
+ {"T" , CONFIG_HLP_TDD, PARAMFLAG_BOOL, iptr:&tddflag, defintval:0, TYPE_INT, 0}, \
+ {"numerology" , CONFIG_HLP_NUMEROLOGY, PARAMFLAG_BOOL, iptr:&numerology, defintval:0, TYPE_INT, 0}, \
+ {"emulate-rf" , CONFIG_HLP_EMULATE_RF, PARAMFLAG_BOOL, iptr:&emulate_rf, defintval:0, TYPE_INT, 0}, \
+ {"parallel-config", CONFIG_HLP_PARALLEL_CMD,0, strptr:(char **)¶llel_config, defstrval:NULL, TYPE_STRING, 0}, \
+ {"worker-config", CONFIG_HLP_WORKER_CMD, 0, strptr:(char **)&worker_config, defstrval:NULL, TYPE_STRING, 0}, \
+ {"nbiot-disable", CONFIG_HLP_DISABLNBIOT, PARAMFLAG_BOOL, iptr:&nonbiotflag, defintval:0, TYPE_INT, 0} \
+ }
+
+#define CONFIG_HLP_FLOG "Enable online log \n"
+#define CONFIG_HLP_LOGL "Set the global log level, valide options: (9:trace, 8/7:debug, 6:info, 4:warn, 3:error)\n"
+#define CONFIG_HLP_LOGV "Set the global log verbosity \n"
+#define CONFIG_HLP_TELN "Start embedded telnet server \n"
+/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+/* command line parameters for LOG utility */
+/* optname helpstr paramflags XXXptr defXXXval type numelt */
+/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+#define CMDLINE_LOGPARAMS_DESC { \
+ {"R" , CONFIG_HLP_FLOG, 0, uptr:&online_log_messages, defintval:1, TYPE_INT, 0}, \
+ {"g" , CONFIG_HLP_LOGL, 0, uptr:&glog_level, defintval:0, TYPE_UINT, 0}, \
+ {"G" , CONFIG_HLP_LOGV, 0, uptr:&glog_verbosity, defintval:0, TYPE_UINT16, 0}, \
+ {"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
+ }
+#define CMDLINE_ONLINELOG_IDX 0
+#define CMDLINE_GLOGLEVEL_IDX 1
+#define CMDLINE_GLOGVERBO_IDX 2
+#define CMDLINE_STARTTELN_IDX 3
+
+
+extern int T_port;
+extern int T_nowait;
+extern int T_dont_fork;
+
+
+
+/***************************************************************************************************************************************/
+
+extern pthread_cond_t sync_cond;
+extern pthread_mutex_t sync_mutex;
+extern int sync_var;
+
+
+extern uint32_t downlink_frequency[MAX_NUM_CCs][4];
+extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
+
+extern int rx_input_level_dBm;
+extern uint8_t exit_missed_slots;
+extern uint64_t num_missed_slots; // counter for the number of missed slots
+
+extern int oaisim_flag;
+extern volatile int oai_exit;
+
+extern openair0_config_t openair0_cfg[MAX_CARDS];
+extern pthread_cond_t sync_cond;
+extern pthread_mutex_t sync_mutex;
+extern int sync_var;
+extern int transmission_mode;
+extern double cpuf;
+
+#if defined(ENABLE_ITTI)
+ extern volatile int start_eNB;
+ extern volatile int start_UE;
+#endif
+
+// In nr-ue.c
+extern int setup_ue_buffers(PHY_VARS_NR_UE **phy_vars_ue, openair0_config_t *openair0_cfg);
+extern void fill_ue_band_info(void);
+extern void init_UE(int);
+extern void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_t *cpuset, char *name);
+extern void reset_opp_meas(void);
+extern void print_opp_meas(void);
+void *UE_thread(void *arg);
+PHY_VARS_NR_UE *init_nr_ue_vars(NR_DL_FRAME_PARMS *frame_parms,
+ uint8_t UE_id,
+ uint8_t abstraction_flag);
+extern tpool_t *Tpool;
+#endif
diff --git a/maketags b/maketags
index ac8d4151d4..eb7c474a38 100755
--- a/maketags
+++ b/maketags
@@ -1,4 +1,4 @@
#!/bin/sh
echo "building ctags for openair1 and openair2 ..."
-ctags -e -R --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair2/RRC/CELLULAR/ --exclude=openair2/NAS/DRIVER/CELLULAR/ --exclude=openair2/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 openair3 targets cmake_targets common nfapi
+ctags -e -R --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair1/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 openair3 targets cmake_targets common nfapi
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
index 36c865be01..d53e91f666 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
@@ -13,6 +13,9 @@
#define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
+#define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
+#define NFAPI_NR_MAX_NB_CORESETS 12
+#define NFAPI_NR_MAX_NB_SEARCH_SPACES 40
// Extension to the generic structures for single tlv values
typedef struct {
@@ -28,12 +31,12 @@ typedef struct {
/*typedef struct {
nfapi_tl_t tl;
int64_t value;
-} nfapi_int64_tlv_t;
+} nfapi_int64_tlv_t;*/
typedef struct {
nfapi_tl_t tl;
uint64_t value;
-} nfapi_uint64_tlv_t;*/
+} nfapi_uint64_tlv_t;
// nFAPI enums
typedef enum {
@@ -175,8 +178,8 @@ typedef struct {
nfapi_uint16_tlv_t physical_cell_id;
nfapi_uint16_tlv_t half_frame_index;
nfapi_uint16_tlv_t ssb_subcarrier_offset;
- nfapi_uint16_tlv_t ssb_sib1_position_in_burst;
- nfapi_uint16_tlv_t ssb_scg_position_in_burst;
+ nfapi_uint16_tlv_t ssb_sib1_position_in_burst; // in sib1
+ nfapi_uint64_tlv_t ssb_scg_position_in_burst; // in servingcellconfigcommon
nfapi_uint16_tlv_t ssb_periodicity;
nfapi_uint16_tlv_t ss_pbch_block_power;
nfapi_uint16_tlv_t n_ssb_crb;
@@ -356,7 +359,8 @@ typedef enum {
typedef enum {
NFAPI_NR_CSET_CONFIG_MIB_SIB1=0,
- NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG
+ NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG, // implicit assumption of coreset Id other than 0
+ NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG_CSET_0
} nfapi_nr_coreset_config_type_e;
typedef enum {
@@ -364,6 +368,31 @@ typedef enum {
NFAPI_NR_CSET_ALL_CONTIGUOUS_RBS
} nfapi_nr_coreset_precoder_granularity_type_e;
+typedef enum {
+ NFAPI_NR_QCL_TYPE_A=0,
+ NFAPI_NR_QCL_TYPE_B,
+ NFAPI_NR_QCL_TYPE_C,
+ NFAPI_NR_QCL_TYPE_D
+} nfapi_nr_qcl_type_e;
+
+typedef enum {
+ NFAPI_NR_SS_PERIODICITY_SL1=1,
+ NFAPI_NR_SS_PERIODICITY_SL2=2,
+ NFAPI_NR_SS_PERIODICITY_SL4=4,
+ NFAPI_NR_SS_PERIODICITY_SL5=5,
+ NFAPI_NR_SS_PERIODICITY_SL8=8,
+ NFAPI_NR_SS_PERIODICITY_SL10=10,
+ NFAPI_NR_SS_PERIODICITY_SL16=16,
+ NFAPI_NR_SS_PERIODICITY_SL20=20,
+ NFAPI_NR_SS_PERIODICITY_SL40=40,
+ NFAPI_NR_SS_PERIODICITY_SL80=80,
+ NFAPI_NR_SS_PERIODICITY_SL160=160,
+ NFAPI_NR_SS_PERIODICITY_SL320=320,
+ NFAPI_NR_SS_PERIODICITY_SL640=640,
+ NFAPI_NR_SS_PERIODICITY_SL1280=1280,
+ NFAPI_NR_SS_PERIODICITY_SL2560=2560
+} nfapi_nr_search_space_monitoring_periodicity_e;
+
typedef enum {
NFAPI_NR_PDSCH_TIME_DOMAIN_ALLOC_TYPE_DEFAULT_A=0,
NFAPI_NR_PDSCH_TIME_DOMAIN_ALLOC_TYPE_DEFAULT_B,
@@ -496,9 +525,9 @@ typedef struct{
uint8_t css_format_2_2;
uint8_t css_format_2_3;
uint8_t uss_dci_formats;
- uint8_t srs_monitoring_periodicity;
- uint8_t slot_monitoring_periodicity;
- uint8_t slot_monitoring_offset;
+ uint16_t srs_monitoring_periodicity;
+ uint16_t slot_monitoring_periodicity;
+ uint16_t slot_monitoring_offset;
uint16_t monitoring_symbols_in_slot;
uint16_t number_of_candidates[NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS];
} nfapi_nr_search_space_t;
@@ -516,7 +545,7 @@ typedef struct {
uint8_t aggregation_level;
uint8_t n_rb;
uint8_t n_symb;
- uint8_t rb_offset;
+ int8_t rb_offset;
uint8_t cr_mapping_type;
uint8_t reg_bundle_size;
uint8_t interleaver_size;
@@ -644,4 +673,45 @@ typedef struct {
nfapi_vendor_extension_tlv_t vendor_extension;
} nfapi_nr_dl_config_request_t;
+
+typedef enum {nr_pusch_freq_hopping_disabled = 0 ,
+ nr_pusch_freq_hopping_enabled = 1
+ } nr_pusch_freq_hopping_t;
+
+typedef struct{
+ uint8_t aperiodicSRS_ResourceTrigger;
+} nfapi_nr_ul_srs_config_t;
+
+typedef struct {
+ uint8_t bandwidth_part_ind;
+ uint16_t number_rbs;
+ uint16_t start_rb;
+ uint8_t frame_offset;
+ uint16_t number_symbols;
+ uint16_t start_symbol;
+ nr_pusch_freq_hopping_t pusch_freq_hopping;
+ uint8_t mcs;
+ uint8_t Qm;
+ uint8_t ndi;
+ uint8_t rv;
+ uint8_t harq_process_nbr;
+ int8_t accumulated_delta_PUSCH;
+ int8_t absolute_delta_PUSCH;
+ uint8_t n_layers;
+ uint8_t tpmi;
+ uint8_t n_dmrs_cdm_groups;
+ uint8_t dmrs_ports[4];
+ uint8_t n_front_load_symb;
+ nfapi_nr_ul_srs_config_t srs_config;
+ uint8_t csi_reportTriggerSize;
+ uint8_t maxCodeBlockGroupsPerTransportBlock;
+ uint8_t ptrs_dmrs_association_port;
+ uint8_t beta_offset_ind;
+} nfapi_nr_ul_config_ulsch_pdu_rel15_t;
+
+typedef struct {
+ uint16_t rnti;
+ nfapi_nr_ul_config_ulsch_pdu_rel15_t ulsch_pdu_rel15;
+} nfapi_nr_ul_config_ulsch_pdu;
+
#endif
diff --git a/openair1/PHY/CODING/TESTBENCH/polartest.c b/openair1/PHY/CODING/TESTBENCH/polartest.c
index 72ef16907c..ddcc3ce826 100644
--- a/openair1/PHY/CODING/TESTBENCH/polartest.c
+++ b/openair1/PHY/CODING/TESTBENCH/polartest.c
@@ -20,7 +20,7 @@
//#define DEBUG_POLARTEST
uint8_t nr_pbch_payload_interleaving_pattern[32] = {16, 23, 18, 17, 8, 30, 10, 6, 24, 7, 0, 5, 3, 2, 1, 4,
- 9, 11, 12, 13, 14, 15, 19, 20, 21, 22, 25, 26, 27, 28, 29, 31};
+ 9, 11, 12, 13, 14, 15, 19, 20, 21, 22, 25, 26, 27, 28, 29, 31};
void nr_init_pbch_interleaver(uint8_t *interleaver) {
uint8_t j_sfn=0, j_hrf=10, j_ssb=11, j_other=14;
@@ -28,7 +28,7 @@ void nr_init_pbch_interleaver(uint8_t *interleaver) {
for (uint8_t i=0; idci_format, params_rel15->rnti_type, &fp->initial_bwp_dl, cfg);
- testLength = 41; //20;
- coderLength = 108*8; //to be changed by aggregate level function.
- } else if (polarMessageType == -1) { //UCI
- //testLength = ;
- //coderLength = ;
- }
+ case 'K':
+ testLength=atoi(optarg);
+ if (testLength <12 || testLength > 60) {
+ printf("Illegal packet bitlength\n",testLength);
+ exit(-1);
+ }
+ break;
- //Logging
- time_t currentTime;
- time (¤tTime);
- char fileName[512], currentTimeInfo[25];
- char folderName[] = ".";
+ case 'h':
+ printf("./polartest -s SNRstart -d SNRinc -f SNRstop -m [0=PBCH|1=DCI|2=UCI] -i iterations -l decoderListSize -a pathMetricAppr -L aggregation level (for DCI) -K packet_length (bits) for DCI/UCI\n");
+ exit(-1);
+ break;
- /*
- folderName=getenv("HOME");
- strcat(folderName,"/Desktop/polartestResults");
- */
-
- #ifdef DEBUG_POLAR_TIMING
- sprintf(fileName,"%s/TIMING_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
- #else
- sprintf(fileName,"%s/_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
- #endif
- strftime(currentTimeInfo, 25, "_%Y-%m-%d-%H-%M-%S.csv", localtime(¤tTime));
- strcat(fileName,currentTimeInfo);
+ default:
+ perror("[polartest.c] Problem at argument parsing with getopt");
+ exit(-1);
+ break;
+ }
- //Create "~/Desktop/polartestResults" folder if it doesn't already exist.
- /*
- struct stat folder = {0};
- if (stat(folderName, &folder) == -1) mkdir(folderName, S_IRWXU | S_IRWXG | S_IRWXO);
- */
-
- FILE* logFile;
- logFile = fopen(fileName, "w");
- if (logFile==NULL) {
- fprintf(stderr,"[polartest.c] Problem creating file %s with fopen\n",fileName);
- exit(-1);
- }
+ if (polarMessageType == 0) { //PBCH
+ } else if (polarMessageType == 1) { //DCI
+ coderLength = 108*aggregation_level;
+ } else if (polarMessageType == -1) { //UCI
+ printf("UCI testing not supported yet\n");
+ exit(-1);
+ }
+ //Logging
+ time_t currentTime;
+ time (¤tTime);
+ char fileName[512], currentTimeInfo[25];
+ char folderName[] = ".";
+ /*
+ folderName=getenv("HOME");
+ strcat(folderName,"/Desktop/polartestResults");
+ */
#ifdef DEBUG_POLAR_TIMING
- fprintf(logFile,",timeEncoderCRCByte[us],timeEncoderCRCBit[us],timeEncoderInterleaver[us],timeEncoderBitInsertion[us],timeEncoder1[us],timeEncoder2[us],timeEncoderRateMatching[us],timeEncoderByte2Bit[us]\n");
+ sprintf(fileName,"%s/TIMING_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
#else
- fprintf(logFile,",SNR,nBitError,blockErrorState,t_encoder[us],t_decoder[us]\n");
+ sprintf(fileName,"%s/_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
#endif
+ strftime(currentTimeInfo, 25, "_%Y-%m-%d-%H-%M-%S.csv", localtime(¤tTime));
+ strcat(fileName,currentTimeInfo);
+ //Create "~/Desktop/polartestResults" folder if it doesn't already exist.
+ /*
+ struct stat folder = {0};
+ if (stat(folderName, &folder) == -1) mkdir(folderName, S_IRWXU | S_IRWXG | S_IRWXO);
+ */
+ FILE *logFile;
+ logFile = fopen(fileName, "w");
- uint8_t testArrayLength = ceil(testLength / 32.0);
- uint8_t coderArrayLength = ceil(coderLength / 32.0);
-
- uint32_t testInput[testArrayLength]; //generate randomly
- uint32_t encoderOutput[coderArrayLength];
- uint32_t estimatedOutput[testArrayLength]; //decoder output
- memset(testInput,0,sizeof(uint32_t) * testArrayLength);
- memset(encoderOutput,0,sizeof(uint32_t) * coderArrayLength);
- memset(estimatedOutput,0,sizeof(uint32_t) * testArrayLength);
-
- uint8_t encoderOutputByte[coderLength];
- double modulatedInput[coderLength]; //channel input
- double channelOutput[coderLength]; //add noise
-
- int16_t channelOutput_int16[coderLength];
-
- t_nrPolar_paramsPtr nrPolar_params = NULL, currentPtr = NULL;
- nr_polar_init(&nrPolar_params, polarMessageType, testLength, aggregation_level);
- currentPtr = nr_polar_params(nrPolar_params, polarMessageType, testLength, aggregation_level);
-
-#ifdef DEBUG_DCI_POLAR_PARAMS
- uint32_t dci_pdu[4];
- memset(dci_pdu,0,sizeof(uint32_t)*4);
- dci_pdu[0]=0x01189400;
- printf("dci_pdu: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- dci_pdu[0], dci_pdu[1], dci_pdu[2], dci_pdu[3]);
- uint32_t encoder_output[54];
- memset(encoder_output,0,sizeof(uint32_t)*54);
- uint16_t size=41;
- uint16_t rnti=3;
- aggregation_level=8;
- nr_polar_init(&nrPolar_params, 1, size, aggregation_level);
- t_nrPolar_paramsPtr currentPtrDCI=nr_polar_params(nrPolar_params, 1, size, aggregation_level);
-
- polar_encoder_dci(dci_pdu, encoder_output, currentPtrDCI, rnti);
- for (int i=0;i<54;i++)
- printf("encoder_output: [%2d]->0x%08x \n",i, encoder_output[i]);
-
- uint8_t *encoder_outputByte = malloc(sizeof(uint8_t) * currentPtrDCI->encoderLength);
- double *channel_output = malloc (sizeof(double) * currentPtrDCI->encoderLength);
- uint32_t dci_estimation[4];
- memset(dci_estimation,0,sizeof(uint32_t)*4);
- printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
- nr_bit2byte_uint32_8(encoder_output, currentPtrDCI->encoderLength, encoder_outputByte);
- printf("[polartest] encoder_outputByte: ");
- for (int i = 0; i < currentPtrDCI->encoderLength; i++) printf("%d-", encoder_outputByte[i]);
- printf("\n");
- for(int i=0; iencoderLength; i++) {
- if (encoder_outputByte[i] == 0) {
- channel_output[i]=1/sqrt(2);
- }
- else {
- channel_output[i]=(-1)/sqrt(2);
- }
- }
-
- decoderState = polar_decoder_dci(channel_output,
- dci_estimation,
- currentPtrDCI,
- NR_POLAR_DECODER_LISTSIZE,
- NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
- rnti);
- printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
- free(encoder_outputByte);
- free(channel_output);
- return 0;
-#endif
-
-#ifdef DEBUG_CRC
- uint32_t crc;
- unsigned int poly24c = 0xb2b11700;
- uint32_t testInputCRC[4];
- testInputCRC[0]=0x00291880;
- //testInputCRC[0]=0x01189400;
- testInputCRC[1]=0x00000000;
- testInputCRC[2]=0x00000000;
- testInputCRC[3]=0x00000000;
-
- uint32_t testInputcrc=0x01189400;
- uint32_t testInputcrc2=0x00291880;
-
- uint8_t testInputCRC2[8];
- nr_crc_bit2bit_uint32_8(testInputCRC, 32, testInputCRC2);
- printf("testInputCRC2: [0]->%x \t [1]->%x \t [2]->%x \t [3]->%x\n"
- " [4]->%x \t [5]->%x \t [6]->%x \t [7]->%x\n",
- testInputCRC2[0], testInputCRC2[1], testInputCRC2[2], testInputCRC2[3],
- testInputCRC2[4], testInputCRC2[5], testInputCRC2[6], testInputCRC2[7]);
- unsigned int crc41 = crc24c(testInputCRC, 32);
- unsigned int crc65 = crc24c(testInputCRC, 56);
- printf("crc41: [0]->0x%08x\tcrc65: [0]->0x%08x\n",crc41, crc65);
- for (int i=0;i<32;i++) printf("crc41[%d]=%d\tcrc65[%d]=%d\n",i,(crc41>>i)&1,i,(crc65>>i)&1);
-
- crc = crc24c(testInputCRC, testLength)>>8;
- for (int i=0;i<24;i++) printf("[i]=%d\n",(crc>>i)&1);
- printf("crc: [0]->0x%08x\n",crc);
- //crcbit(testInputCRC, sizeof(test) - 1, poly24c));
-
- testInputCRC[testLength>>3] = ((uint8_t*)&crc)[2];
- testInputCRC[1+(testLength>>3)] = ((uint8_t*)&crc)[1];
- testInputCRC[2+(testLength>>3)] = ((uint8_t*)&crc)[0];
- printf("testInputCRC: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- testInputCRC[0], testInputCRC[1], testInputCRC[2], testInputCRC[3]);
-
-
- //uint32_t trial32 = 0xffffffff;
- uint32_t trial32 = 0xf10fffff;
- uint8_t a[4];
- //memcpy(a, &trial32, sizeof(trial32));
- *(uint32_t *)a = trial32;
- unsigned char trial[4];
- trial[0]=0xff; trial[1]=0xff; trial[2]=0x0f; trial[3]=0xf1;
- uint32_t trialcrc = crc24c(trial, 32);
- uint32_t trialcrc32 = crc24c((uint8_t *)&trial32, 32);
- //uint32_t trialcrc32 = crc24c(a, 32);
- printf("crcbit(trial = %x\n", crcbit(trial, 4, poly24c));
- printf("trialcrc = %x\n", trialcrc);
- printf("trialcrc32 = %x\n", trialcrc32);
- for (int i=0;i<32;i++) printf("trialcrc[%2d]=%d\ttrialcrc32[%2d]=%d\n",i,(trialcrc>>i)&1,i,(trialcrc32>>i)&1);
-
-
- //uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
- uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,1};
- uint8_t nr_polar_crc[24];
- uint8_t **crc_generator_matrix = crc24c_generator_matrix(32);
- nr_matrix_multiplication_uint8_1D_uint8_2D(nr_polar_A,
- crc_generator_matrix,
- nr_polar_crc,
- 32,
- 24);
- for (uint8_t i = 0; i < 24; i++){
- nr_polar_crc[i] = (nr_polar_crc[i] % 2);
- printf("nr_polar_crc[%d]=%d\n",i,nr_polar_crc[i]);
- }
- return 0;
-#endif
+ if (logFile==NULL) {
+ fprintf(stderr,"[polartest.c] Problem creating file %s with fopen\n",fileName);
+ exit(-1);
+ }
#ifdef DEBUG_POLAR_TIMING
- for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
- SNR_lin = pow(10, SNR / 10);
- for (itr = 1; itr <= iterations; itr++) {
- for (int j=0; j0x%08x \n", testInput[0]);
- polar_encoder_timing(testInput, encoderOutput, currentPtr, cpu_freq_GHz, logFile);
- }
- }
- fclose(logFile);
- free(testInput);
- free(encoderOutput);
- free(modulatedInput);
- free(channelOutput);
- free(estimatedOutput);
- return (0);
+ fprintf(logFile,
+ ",timeEncoderCRCByte[us],timeEncoderCRCBit[us],timeEncoderInterleaver[us],timeEncoderBitInsertion[us],timeEncoder1[us],timeEncoder2[us],timeEncoderRateMatching[us],timeEncoderByte2Bit[us]\n");
+#else
+ fprintf(logFile,",SNR,nBitError,blockErrorState,t_encoder[us],t_decoder[us]\n");
#endif
+ uint8_t testArrayLength = ceil(testLength / 32.0);
+ uint8_t coderArrayLength = ceil(coderLength / 32.0);
+ uint32_t testInput[testArrayLength]; //generate randomly
+ uint32_t encoderOutput[coderArrayLength];
+ uint32_t estimatedOutput[testArrayLength]; //decoder output
+ memset(testInput,0,sizeof(uint32_t) * testArrayLength);
+ memset(encoderOutput,0,sizeof(uint32_t) * coderArrayLength);
+ memset(estimatedOutput,0,sizeof(uint32_t) * testArrayLength);
+ uint8_t encoderOutputByte[coderLength];
+ double modulatedInput[coderLength]; //channel input
+ double channelOutput[coderLength]; //add noise
+ int16_t channelOutput_int16[coderLength];
+ t_nrPolar_params *currentPtr = nr_polar_params(polarMessageType, testLength, aggregation_level);
+#ifdef DEBUG_DCI_POLAR_PARAMS
+ uint32_t dci_pdu[4];
+ memset(dci_pdu,0,sizeof(uint32_t)*4);
+ dci_pdu[0]=0x01189400;
+ printf("dci_pdu: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ dci_pdu[0], dci_pdu[1], dci_pdu[2], dci_pdu[3]);
+ uint32_t encoder_output[54];
+ memset(encoder_output,0,sizeof(uint32_t)*54);
+ uint16_t size=41;
+ uint16_t rnti=3;
+ aggregation_level=8;
+ t_nrPolar_params *currentPtrDCI=nr_polar_params(1, size, aggregation_level);
+ polar_encoder_dci(dci_pdu, encoder_output, currentPtrDCI, rnti);
- // We assume no a priori knowledge available about the payload.
- double aPrioriArray[currentPtr->payloadBits];
- for (int i=0; ipayloadBits; i++) aPrioriArray[i] = NAN;
+ for (int i=0; i<54; i++)
+ printf("encoder_output: [%2d]->0x%08x \n",i, encoder_output[i]);
- for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
- printf("SNR %f\n",SNR);
- SNR_lin = pow(10, SNR/10);
- for (itr = 1; itr <= iterations; itr++) {
+ uint8_t *encoder_outputByte = malloc(sizeof(uint8_t) * currentPtrDCI->encoderLength);
+ double *channel_output = malloc (sizeof(double) * currentPtrDCI->encoderLength);
+ uint32_t dci_estimation[4];
+ memset(dci_estimation,0,sizeof(uint32_t)*4);
+ printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
+ nr_bit2byte_uint32_8(encoder_output, currentPtrDCI->encoderLength, encoder_outputByte);
+ printf("[polartest] encoder_outputByte: ");
- for (int i = 0; i < testArrayLength; i++) {
- for (int j = 0; j < (sizeof(testInput[0])*8)-1; j++) {
- testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
- testInput[i]<<=1;
- }
- testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
- }
+ for (int i = 0; i < currentPtrDCI->encoderLength; i++) printf("%d-", encoder_outputByte[i]);
-#ifdef DEBUG_POLARTEST
- printf("testInput: ");
- for (int i = 0; i < testArrayLength; i++) printf("[%d]->0x%08x\t",i, testInput[i]);
- printf("\n");
+ printf("\n");
- printf("testInput[0]: ");
- for (int i=0; i<32; i++) printf("[%d]=%d-",i,(testInput[0]>>i)&1);
- printf("\n");
- printf("testInput[1]: ");
- for (int i=0; i<32; i++) printf("[%d]=%d-",i,(testInput[1]>>i)&1);
- printf("\n");
+ for(int i=0; iencoderLength; i++) {
+ if (encoder_outputByte[i] == 0) {
+ channel_output[i]=1/sqrt(2);
+ } else {
+ channel_output[i]=(-1)/sqrt(2);
+ }
+ }
+
+ decoderState = polar_decoder_dci(channel_output,
+ dci_estimation,
+ currentPtrDCI,
+ NR_POLAR_DECODER_LISTSIZE,
+ NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
+ rnti);
+ printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
+ free(encoder_outputByte);
+ free(channel_output);
+ return 0;
#endif
+#ifdef DEBUG_CRC
+ uint32_t crc;
+ unsigned int poly24c = 0xb2b11700;
+ uint32_t testInputCRC[4];
+ testInputCRC[0]=0x00291880;
+ //testInputCRC[0]=0x01189400;
+ testInputCRC[1]=0x00000000;
+ testInputCRC[2]=0x00000000;
+ testInputCRC[3]=0x00000000;
+ uint32_t testInputcrc=0x01189400;
+ uint32_t testInputcrc2=0x00291880;
+ uint8_t testInputCRC2[8];
+ nr_crc_bit2bit_uint32_8(testInputCRC, 32, testInputCRC2);
+ printf("testInputCRC2: [0]->%x \t [1]->%x \t [2]->%x \t [3]->%x\n"
+ " [4]->%x \t [5]->%x \t [6]->%x \t [7]->%x\n",
+ testInputCRC2[0], testInputCRC2[1], testInputCRC2[2], testInputCRC2[3],
+ testInputCRC2[4], testInputCRC2[5], testInputCRC2[6], testInputCRC2[7]);
+ unsigned int crc41 = crc24c(testInputCRC, 32);
+ unsigned int crc65 = crc24c(testInputCRC, 56);
+ printf("crc41: [0]->0x%08x\tcrc65: [0]->0x%08x\n",crc41, crc65);
- int len_mod64=currentPtr->payloadBits&63;
- ((uint64_t*)testInput)[currentPtr->payloadBits/64]&=((((uint64_t)1)<>i)&1,i,(crc65>>i)&1);
-#ifdef DEBUG_POLARTEST
- printf("testInput: ");
- for (int i = 0; i < testArrayLength; i++) printf("[%d]->0x%08x\t",i, testInput[i]);
- printf("\n");
+ crc = crc24c(testInputCRC, testLength)>>8;
- printf("testInput[0]: ");
- for (int i=0; i<32; i++) printf("[%d]=%d-",i,(testInput[0]>>i)&1);
- printf("\n");
- printf("testInput[1]: ");
- for (int i=0; i<32; i++) printf("[%d]=%d-",i,(testInput[1]>>i)&1);
- printf("\n");
+ for (int i=0; i<24; i++) printf("[i]=%d\n",(crc>>i)&1);
+
+ printf("crc: [0]->0x%08x\n",crc);
+ //crcbit(testInputCRC, sizeof(test) - 1, poly24c));
+ testInputCRC[testLength>>3] = ((uint8_t *)&crc)[2];
+ testInputCRC[1+(testLength>>3)] = ((uint8_t *)&crc)[1];
+ testInputCRC[2+(testLength>>3)] = ((uint8_t *)&crc)[0];
+ printf("testInputCRC: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ testInputCRC[0], testInputCRC[1], testInputCRC[2], testInputCRC[3]);
+ //uint32_t trial32 = 0xffffffff;
+ uint32_t trial32 = 0xf10fffff;
+ uint8_t a[4];
+ //memcpy(a, &trial32, sizeof(trial32));
+ *(uint32_t *)a = trial32;
+ unsigned char trial[4];
+ trial[0]=0xff;
+ trial[1]=0xff;
+ trial[2]=0x0f;
+ trial[3]=0xf1;
+ uint32_t trialcrc = crc24c(trial, 32);
+ uint32_t trialcrc32 = crc24c((uint8_t *)&trial32, 32);
+ //uint32_t trialcrc32 = crc24c(a, 32);
+ printf("crcbit(trial = %x\n", crcbit(trial, 4, poly24c));
+ printf("trialcrc = %x\n", trialcrc);
+ printf("trialcrc32 = %x\n", trialcrc32);
+
+ for (int i=0; i<32; i++) printf("trialcrc[%2d]=%d\ttrialcrc32[%2d]=%d\n",i,(trialcrc>>i)&1,i,(trialcrc32>>i)&1);
+
+ //uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+ uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,1};
+ uint8_t nr_polar_crc[24];
+ uint8_t **crc_generator_matrix = crc24c_generator_matrix(32);
+ nr_matrix_multiplication_uint8_1D_uint8_2D(nr_polar_A,
+ crc_generator_matrix,
+ nr_polar_crc,
+ 32,
+ 24);
+
+ for (uint8_t i = 0; i < 24; i++) {
+ nr_polar_crc[i] = (nr_polar_crc[i] % 2);
+ printf("nr_polar_crc[%d]=%d\n",i,nr_polar_crc[i]);
+ }
+
+ return 0;
#endif
+#ifdef DEBUG_POLAR_TIMING
+ for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
+ SNR_lin = pow(10, SNR / 10);
- if (matlabDebug == 1){
- memset(testInput,0,sizeof(uint32_t) * testArrayLength);
- /*testInput[0] |= ((uint32_t)1 << 31); testInput[0] |= ((uint32_t)1 << 28); testInput[0] |= ((uint32_t)1 << 26);
- testInput[0] |= ((uint32_t)1 << 25); testInput[0] |= ((uint32_t)1 << 22); testInput[0] |= ((uint32_t)1 << 21);
- testInput[0] |= ((uint32_t)1 << 19); testInput[0] |= ((uint32_t)1 << 17); testInput[0] |= ((uint32_t)1 << 15);
- testInput[0] |= ((uint32_t)1 << 14); testInput[0] |= ((uint32_t)1 << 12); testInput[0] |= ((uint32_t)1 << 10);
- testInput[0] |= ((uint32_t)1 << 8); testInput[0] |= ((uint32_t)1 << 5); testInput[0] |= ((uint32_t)1 << 3);
- testInput[0] |= ((uint32_t)1 << 2); testInput[0] |= ((uint32_t)1 << 1);*/
+ for (itr = 1; itr <= iterations; itr++) {
+ for (int j=0; j0x%08x \n", testInput[0]);
+ polar_encoder_timing(testInput, encoderOutput, currentPtr, cpu_freq_GHz, logFile);
+ }
+ }
+ fclose(logFile);
+ free(testInput);
+ free(encoderOutput);
+ free(modulatedInput);
+ free(channelOutput);
+ free(estimatedOutput);
+ return (0);
+#endif
+ // We assume no a priori knowledge available about the payload.
+ double aPrioriArray[currentPtr->payloadBits];
- testInput[0] |= ((uint32_t)1 << 30); testInput[0] |= ((uint32_t)1 << 29); testInput[0] |= ((uint32_t)1 << 28);
- testInput[0] |= ((uint32_t)1 << 26); testInput[0] |= ((uint32_t)1 << 23); testInput[0] |= ((uint32_t)1 << 21);
- testInput[0] |= ((uint32_t)1 << 19); testInput[0] |= ((uint32_t)1 << 17); testInput[0] |= ((uint32_t)1 << 16);
- testInput[0] |= ((uint32_t)1 << 14); testInput[0] |= ((uint32_t)1 << 12); testInput[0] |= ((uint32_t)1 << 10);
- testInput[0] |= ((uint32_t)1 << 9); testInput[0] |= ((uint32_t)1 << 6); testInput[0] |= ((uint32_t)1 << 5);
- testInput[0] |= ((uint32_t)1 << 3); testInput[0] |= ((uint32_t)1);
+ for (int i=0; ipayloadBits; i++) aPrioriArray[i] = NAN;
+ for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
+ printf("SNR %f\n",SNR);
+ SNR_lin = pow(10, SNR/10);
- /*printf("testInput (a_31,..., a_0): ");
- for (int i=31; i>=0; i--) printf("%d-",(testInput[0]>>i)&1); //a_31, a_30, ..., a_0
- printf("testInput = 0x%llx\n", testInput[0]);
- printf("\n");*/
+ for (itr = 1; itr <= iterations; itr++) {
+ for (int i = 0; i < testArrayLength; i++) {
+ for (int j = 0; j < (sizeof(testInput[0])*8)-1; j++) {
+ testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
+ testInput[i]<<=1;
+ }
+ testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
+ }
- /*for (int i=0;i<32;i++){
- memset(testInput,0,sizeof(uint32_t) * testArrayLength);
- testInput[0] |= ((uint32_t)1 << i);
- int crc = crc24c(testInput,32);
- printf("[i=%d]testInput = 0x%08lx, crc = 0x%lx\n", i,testInput[0], crc);
- }
- memset(testInput,0,sizeof(uint32_t) * testArrayLength);
- int crc = crc24c(testInput,32);
- printf("testInput = 0x%08lx, crc = 0x%lx\n", testInput[0], crc);*/
+ /*printf("testInput: [0]->0x%08x\n", testInput[0]);
+ for (int i=0; i<32; i++)
+ printf("%d\n",(testInput[0]>>i)&1);*/
+ int len_mod64=currentPtr->payloadBits&63;
+ ((uint64_t *)testInput)[currentPtr->payloadBits/64]&=((((uint64_t)1)<0x%08x\n", encoderOutput[0]);
+ printf("encoderOutput: [1]->0x%08x\n", encoderOutput[1]);*/
+ //Bit-to-byte:
+ nr_bit2byte_uint32_8(encoderOutput, coderLength, encoderOutputByte);
- for (int i=0; i0x%08x\n", encoderOutput[0]);
- printf("encoderOutput: [1]->0x%08x\n", encoderOutput[1]);*/
+ if (decoder_int16==1) {
+ if (channelOutput[i] > 15) channelOutput_int16[i] = 127;
+ else if (channelOutput[i] < -16) channelOutput_int16[i] = -128;
+ else channelOutput_int16[i] = (int16_t) (8*channelOutput[i]);
+ }
+ }
- //Bit-to-byte:
- nr_bit2byte_uint32_8(encoderOutput, coderLength, encoderOutputByte);
+ start_meas(&timeDecoder);
- //BPSK modulation
- for(int i=0; i0x%08x\n", testInput[0]);
+ printf("estimatedOutput: [0]->0x%08x\n", estimatedOutput[0]);*/
- channelOutput[i] = modulatedInput[i] + (gaussdouble(0.0,1.0) * (1/sqrt(SNR_lin)));
- //channelOutput[i] = modulatedInput[i] + (gaussdouble(0.0,1.0) * (1/sqrt(2*SNR_lin)));
+ //calculate errors
+ if (decoderState!=0) {
+ blockErrorState=-1;
+ nBitError=-1;
+ } else {
+ for (int j = 0; j < currentPtr->payloadBits; j++) {
+ if (((estimatedOutput[0]>>j) & 1) != ((testInput[0]>>j) & 1)) nBitError++;
- if (decoder_int16==1) {
- if (channelOutput[i] > 15)
- channelOutput_int16[i] = 127;
- else if (channelOutput[i] < -16)
- channelOutput_int16[i] = -128;
- else
- channelOutput_int16[i] = (int16_t) (8*channelOutput[i]);
- }
- }
+ // printf("bit %d: %d => %d\n",j,(testInput[0]>>j)&1,(estimatedOutput[0]>>j)&1);
+ }
- start_meas(&timeDecoder);
- /*decoderState = polar_decoder(channelOutput,
- estimatedOutput,
- currentPtr,
- NR_POLAR_DECODER_LISTSIZE,
- aPrioriArray,
- NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION);*/
- if (decoder_int16 == 1)
- decoderState = polar_decoder_int16(channelOutput_int16,
- (uint64_t*) estimatedOutput,
- currentPtr);
- else
- decoderState = polar_decoder_aPriori(channelOutput,
- estimatedOutput, currentPtr,
- NR_POLAR_DECODER_LISTSIZE,
- NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
- aPrioriArray);
-
- stop_meas(&timeDecoder);
- /*printf("testInput: [0]->0x%08x\n", testInput[0]);
- printf("estimatedOutput: [0]->0x%08x\n", estimatedOutput[0]);*/
+ if (nBitError>0) {
+ blockErrorState=1;
+ // printf("Error: Input %x, Output %x\n",testInput[0],estimatedOutput[0]);
+ }
+ }
- //calculate errors
- if (decoderState!=0) {
- blockErrorState=-1;
- nBitError=-1;
- } else {
- for (int j = 0; j < currentPtr->payloadBits; j++) {
- if (((estimatedOutput[0]>>j) & 1) != ((testInput[0]>>j) & 1))
- nBitError++;
- // printf("bit %d: %d => %d\n",j,(testInput[0]>>j)&1,(estimatedOutput[0]>>j)&1);
- }
- if (nBitError>0) {
- blockErrorState=1;
- //printf("Error: Input %x, Output %x\n",testInput[0],estimatedOutput[0]);
- }
- }
+ //Iteration times are in microseconds.
+ timeEncoderCumulative+=(timeEncoder.diff/(cpu_freq_GHz*1000.0));
+ timeDecoderCumulative+=(timeDecoder.diff/(cpu_freq_GHz*1000.0));
+ fprintf(logFile,",%f,%d,%d,%f,%f\n", SNR, nBitError, blockErrorState,
+ (timeEncoder.diff/(cpu_freq_GHz*1000.0)), (timeDecoder.diff/(cpu_freq_GHz*1000.0)));
- //Iteration times are in microseconds.
- fprintf(logFile,",%f,%d,%d,%f,%f\n", SNR, nBitError, blockErrorState,
- (timeEncoder.diff/(cpu_freq_GHz*1000.0)), (timeDecoder.diff/(cpu_freq_GHz*1000.0)));
+ if (nBitError<0) {
+ blockErrorCumulative++;
+ bitErrorCumulative+=testLength;
+ } else {
+ blockErrorCumulative+=blockErrorState;
+ bitErrorCumulative+=nBitError;
+ }
- if (nBitError<0) {
- blockErrorCumulative++;
- bitErrorCumulative+=testLength;
- } else {
- blockErrorCumulative+=blockErrorState;
- bitErrorCumulative+=nBitError;
- }
+ decoderState=0;
+ nBitError=0;
+ blockErrorState=0;
+ }
- decoderState=0;
- nBitError=0;
- blockErrorState=0;
+ //Calculate error statistics for the SNR.
+ printf("[ListSize=%d, Appr=%d] SNR=%+8.3f, BLER=%9.6f, BER=%12.9f, t_Encoder=%9.3fus, t_Decoder=%9.3fus\n",
+ decoderListSize, pathMetricAppr, SNR, ((double)blockErrorCumulative/iterations),
+ ((double)bitErrorCumulative / (iterations*testLength)),
+ (double)timeEncoder.diff/timeEncoder.trials/(cpu_freq_GHz*1000.0),(double)timeDecoder.diff/timeDecoder.trials/(cpu_freq_GHz*1000.0));
+ //(timeEncoderCumulative/iterations),timeDecoderCumulative/iterations);
- }
- //Calculate error statistics for the SNR.
- printf("[ListSize=%d, Appr=%d] SNR=%+8.3f, BLER=%9.6f, BER=%12.9f, t_Encoder=%12.6fus, t_Decoder=%12.6fus\n",
- decoderListSize, pathMetricAppr, SNR, ((double)blockErrorCumulative/iterations),
- ((double)bitErrorCumulative / (iterations*testLength)),
- (double)timeEncoder.diff/timeEncoder.trials/(cpu_freq_GHz*1000.0),
- (double)timeDecoder.diff/timeDecoder.trials/(cpu_freq_GHz*1000.0));
+ if (blockErrorCumulative==0 && bitErrorCumulative==0)
+ break;
- if (blockErrorCumulative==0 && bitErrorCumulative==0)
- break;
+ blockErrorCumulative = 0;
+ bitErrorCumulative = 0;
+ timeEncoderCumulative = 0;
+ timeDecoderCumulative = 0;
+ }
- blockErrorCumulative = 0; bitErrorCumulative = 0;
- }
-
- print_meas(&timeEncoder,"polar_encoder",NULL,NULL);
- print_meas(&timeDecoder,"polar_decoder",NULL,NULL);
-
- fclose(logFile);
- return (0);
+ print_meas(&timeEncoder,"polar_encoder",NULL,NULL);
+ print_meas(&timeDecoder,"polar_decoder",NULL,NULL);
+ fclose(logFile);
+ return (0);
}
diff --git a/openair1/PHY/CODING/TESTBENCH/smallblocktest.c b/openair1/PHY/CODING/TESTBENCH/smallblocktest.c
index 7ffa3900a6..0b863d2cbf 100644
--- a/openair1/PHY/CODING/TESTBENCH/smallblocktest.c
+++ b/openair1/PHY/CODING/TESTBENCH/smallblocktest.c
@@ -99,7 +99,6 @@ int main(int argc, char *argv[]) {
testInput<<=1;
}
testInput |= ( ((uint32_t) (rand()%2)) &1);
-
//Encoding
start_meas(&timeEncoder);
encoderOutput = encodeSmallBlock((uint16_t*)&testInput, (uint8_t)messageLength);
diff --git a/openair1/PHY/CODING/coding_defs.h b/openair1/PHY/CODING/coding_defs.h
index 1b23de1cb9..2277826a66 100644
--- a/openair1/PHY/CODING/coding_defs.h
+++ b/openair1/PHY/CODING/coding_defs.h
@@ -455,7 +455,7 @@ int32_t nr_segmentation(unsigned char *input_buffer,
unsigned int B,
unsigned int *C,
unsigned int *K,
- unsigned int *Zout,
+ unsigned int *Zout,
unsigned int *F);
uint32_t nr_compute_tbs(uint8_t mcs,
diff --git a/openair1/PHY/CODING/crc_byte.c b/openair1/PHY/CODING/crc_byte.c
index 67190698e1..bf8d63fb39 100644
--- a/openair1/PHY/CODING/crc_byte.c
+++ b/openair1/PHY/CODING/crc_byte.c
@@ -32,6 +32,7 @@
#include "coding_defs.h"
+#include "assertions.h"
/*ref 36-212 v8.6.0 , pp 8-9 */
/* the highest degree is set by default */
@@ -275,7 +276,7 @@ int check_crc(uint8_t* decoded_bytes, uint32_t n, uint32_t F, uint8_t crc_type)
break;
default:
- crc_len=3;
+ AssertFatal(1,"Invalid crc_type \n");
}
for (int i=0; i>24;
break;
+
+ default:
+ AssertFatal(1,"Invalid crc_type \n");
}
if (crc == oldcrc)
diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
index bbcd34c368..af84205481 100644
--- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
+++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
@@ -54,7 +54,7 @@ int32_t nrLDPC_decoder(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t*
t_nrLDPC_lut lut;
t_nrLDPC_lut* p_lut = &lut;
- printf("p_procBuf->cnProcBuf = %p\n", p_procBuf->cnProcBuf);
+ //printf("p_procBuf->cnProcBuf = %p\n", p_procBuf->cnProcBuf);
// Initialize decoder core(s) with correct LUTs
numLLR = nrLDPC_init(p_decParams, p_lut);
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
index b754bda1f9..5cf044309e 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
@@ -39,760 +39,1101 @@
#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
#include "assertions.h"
-int8_t polar_decoder(double *input,
- uint8_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr)
-{
- //Assumes no a priori knowledge.
+int8_t polar_decoder(
+ double *input,
+ uint8_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr) {
+ //Assumes no a priori knowledge.
+ uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- for (int i=0; i<(2*listSize); i++) {
- pathMetric[i] = 0;
- crcState[i]=1;
- }
- for (int i=0; iN; i++) {
- llrUpdated[i][polarParams->n]=1;
- bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
- }
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i = 0; i < polarParams->K; i++){
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i=0; ipayloadBits; i++) {
- for (int j=0; jcrcParityBits; j++) {
- tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
- }
- }
- for (int i=polarParams->payloadBits; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- if( (i-polarParams->payloadBits) == j ){
- tempECGM[i][j]=1;
- } else {
- tempECGM[i][j]=0;
- }
- }
- }
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- for (int i=0; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
- }
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
+ }
+ }
- //The index of the last 1-valued bit that appears in each column.
- uint16_t last1ind[polarParams->crcParityBits];
- for (int j=0; jcrcParityBits; j++) {
- for (int i=0; iK; i++) {
- if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
- }
- }
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
- nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
- /*
- * SCL polar decoder.
- */
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
- uint32_t nonFrozenBit=0;
- uint8_t currentListSize=1;
- uint8_t decoderIterationCheck=0;
- int16_t checkCrcBits=-1;
- uint8_t listIndex[2*listSize], copyIndex;
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (uint16_t currentBit=0; currentBitN; currentBit++){
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
- } else { //Information or CRC bit.
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
- for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
- bit[j][k][i+currentListSize]=bit[j][k][i];
- llr[j][k][i+currentListSize]=llr[j][k][i];}}}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
- for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
- currentListSize*=2;
+ /*
+ * SCL polar decoder.
+ */
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
- //Keep only the best "listSize" number of entries.
- if (currentListSize > listSize) {
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
- uint8_t swaps, tempInd;
- for (uint8_t i = 0; i < listSize; i++) {
- swaps = 0;
- for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
- if (listIndex[j+1] > listIndex[j]) {
- tempInd = listIndex[j];
- listIndex[j] = listIndex[j + 1];
- listIndex[j + 1] = tempInd;
- swaps++;
- }
- }
- if (swaps == 0)
- break;
- }
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
- //First, backup the best "listSize" number of entries.
- for (int k=(listSize-1); k>0; k--) {
- for (int i=0; iN; i++) {
- for (int j=0; j<(polarParams->n+1); j++) {
- bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
- llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
- }
- }
- }
- for (int k=(listSize-1); k>0; k--) {
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
- }
- }
- for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
- //Copy the best "listSize" number of entries to the first indices.
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->N; i++) {
- for (int j = 0; j < (polarParams->n + 1); j++) {
- bit[i][j][k] = bit[i][j][copyIndex];
- llr[i][j][k] = llr[i][j][copyIndex];
- }
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][k]=crcChecksum[i][copyIndex];
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- crcState[k]=crcState[copyIndex];
- }
- currentListSize = listSize;
- }
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- for (int i=0; icrcParityBits; i++) {
- if (last1ind[i]==nonFrozenBit) {
- checkCrcBits=i;
- break;
- }
- }
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
- if ( checkCrcBits > (-1) ) {
- for (uint8_t i = 0; i < currentListSize; i++) {
- if (crcChecksum[checkCrcBits][i]==1) {
- crcState[i]=0; //0=False, 1=True
- }
- }
- }
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
- if (decoderIterationCheck==0) {
- //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- return(-1);
- }
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
- nonFrozenBit++;
- decoderIterationCheck=0;
- checkCrcBits=-1;
- }
- }
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
- for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
- if ( crcState[listIndex[i]] == 1 ) {
- for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+ if (swaps == 0)
+ break;
+ }
- //Extract the information bits (û to ĉ)
- nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
- //Deinterleaving (ĉ to b)
- nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
-
- //Remove the CRC (â)
- for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
- break;
- }
- }
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
- /*
- * Return bits.
- */
- //nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]==1) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ //nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
}
int8_t polar_decoder_aPriori(double *input,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- double *aPrioriPayload)
-{
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload) {
+ uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- for (int i=0; i<(2*listSize); i++) {
- pathMetric[i] = 0;
- crcState[i]=1;
- }
- for (int i=0; iN; i++) {
- llrUpdated[i][polarParams->n]=1;
- bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
- }
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i = 0; i < polarParams->K; i++){
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- for (int i=0; ipayloadBits; i++) {
- for (int j=0; jcrcParityBits; j++) {
- tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
- }
- }
- for (int i=polarParams->payloadBits; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- if( (i-polarParams->payloadBits) == j ){
- tempECGM[i][j]=1;
- } else {
- tempECGM[i][j]=0;
- }
- }
- }
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i=0; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
- }
- }
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- //The index of the last 1-valued bit that appears in each column.
- uint16_t last1ind[polarParams->crcParityBits];
- for (int j=0; jcrcParityBits; j++) {
- for (int i=0; iK; i++) {
- if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
- }
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
+ }
+ }
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
- nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
+
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
+
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
+
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
+
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
+
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+
+ /*
+ * SCL polar decoder.
+ */
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
+
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
+
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 0) ) {
+ //Information bit with known value of "0".
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr);
+ bitUpdated[currentBit][0]=1; //0=False, 1=True
+ } else if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 1) ) {
+ //Information bit with known value of "1".
+ updatePathMetric(pathMetric, llr, currentListSize, 1, currentBit, pathMetricAppr);
+
+ for (uint8_t i=0; icrcParityBits);
+ } else {
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
+
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
+
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
+
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
+
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
+
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
+
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
+
+ if (swaps == 0)
+ break;
+ }
+
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]==1) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++)
+ polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
+}
- /*
- * SCL polar decoder.
- */
- uint32_t nonFrozenBit=0;
- uint8_t currentListSize=1;
- uint8_t decoderIterationCheck=0;
- int16_t checkCrcBits=-1;
- uint8_t listIndex[2*listSize], copyIndex;
+int8_t polar_decoder_aPriori_timing(double *input,
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload,
+ double cpuFreqGHz,
+ FILE *logFile) {
+ uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- for (uint16_t currentBit=0; currentBitN; currentBit++){
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
- } else { //Information or CRC bit.
- if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
- (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 0) ) {
- //Information bit with known value of "0".
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr);
- bitUpdated[currentBit][0]=1; //0=False, 1=True
- } else if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
- (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 1) ) {
- //Information bit with known value of "1".
- updatePathMetric(pathMetric, llr, currentListSize, 1, currentBit, pathMetricAppr);
- for (uint8_t i=0; icrcParityBits);
- } else {
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
- bit[j][k][i+currentListSize]=bit[j][k][i];
- llr[j][k][i+currentListSize]=llr[j][k][i];}}}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
- for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
- currentListSize*=2;
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- //Keep only the best "listSize" number of entries.
- if (currentListSize > listSize) {
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
- uint8_t swaps, tempInd;
- for (uint8_t i = 0; i < listSize; i++) {
- swaps = 0;
- for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
- if (listIndex[j+1] > listIndex[j]) {
- tempInd = listIndex[j];
- listIndex[j] = listIndex[j + 1];
- listIndex[j + 1] = tempInd;
- swaps++;
- }
- }
- if (swaps == 0)
- break;
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
+ }
+ }
- //First, backup the best "listSize" number of entries.
- for (int k=(listSize-1); k>0; k--) {
- for (int i=0; iN; i++) {
- for (int j=0; j<(polarParams->n+1); j++) {
- bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
- llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
- }
- }
- }
- for (int k=(listSize-1); k>0; k--) {
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
- }
- }
- for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
- //Copy the best "listSize" number of entries to the first indices.
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->N; i++) {
- for (int j = 0; j < (polarParams->n + 1); j++) {
- bit[i][j][k] = bit[i][j][copyIndex];
- llr[i][j][k] = llr[i][j][copyIndex];
- }
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][k]=crcChecksum[i][copyIndex];
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- crcState[k]=crcState[copyIndex];
- }
- currentListSize = listSize;
- }
- }
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
- for (int i=0; icrcParityBits; i++) {
- if (last1ind[i]==nonFrozenBit) {
- checkCrcBits=i;
- break;
- }
- }
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
- if ( checkCrcBits > (-1) ) {
- for (uint8_t i = 0; i < currentListSize; i++) {
- if (crcChecksum[checkCrcBits][i]==1) {
- crcState[i]=0; //0=False, 1=True
- }
- }
- }
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
- if (decoderIterationCheck==0) {
- //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- return(-1);
- }
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- nonFrozenBit++;
- decoderIterationCheck=0;
- checkCrcBits=-1;
- }
- }
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ /*
+ * SCL polar decoder.
+ */
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
- for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
- if ( crcState[listIndex[i]] == 1 ) {
- for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- //Extract the information bits (û to ĉ)
- nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 0) ) {
+ //Information bit with known value of "0".
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr);
+ bitUpdated[currentBit][0]=1; //0=False, 1=True
+ } else if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 1) ) {
+ //Information bit with known value of "1".
+ updatePathMetric(pathMetric, llr, currentListSize, 1, currentBit, pathMetricAppr);
- //Deinterleaving (ĉ to b)
- nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+ for (uint8_t i=0; ipayloadBits; j++)
- polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
- break;
- }
- }
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ } else {
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
- /*
- * Return bits.
- */
- nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
+
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
+
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
+
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
+
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
+
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
+
+ if (swaps == 0)
+ break;
+ }
+
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]==1) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
}
int8_t polar_decoder_dci(double *input,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- uint16_t n_RNTI)
-{
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- uint8_t extended_crc_scrambling_pattern[polarParams->crcParityBits];
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ uint16_t n_RNTI) {
+ uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ uint8_t extended_crc_scrambling_pattern[polarParams->crcParityBits];
- for (int i=0; i<(2*listSize); i++) {
- pathMetric[i] = 0;
- crcState[i]=1;
- }
- for (int i=0; iN; i++) {
- llrUpdated[i][polarParams->n]=1;
- bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
- }
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3: K-by-P
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2: K-by-P
- for (int i = 0; i < polarParams->K; i++){
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- for (int i=0; ipayloadBits; i++) {
- for (int j=0; jcrcParityBits; j++) {
- tempECGM[i][j]=polarParams->crc_generator_matrix[i+polarParams->crcParityBits][j];
- }
- }
- for (int i=polarParams->payloadBits; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- if( (i-polarParams->payloadBits) == j ){
- tempECGM[i][j]=1;
- } else {
- tempECGM[i][j]=0;
- }
- }
- }
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3: K-by-P
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2: K-by-P
- for (int i=0; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
- }
- }
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- //The index of the last 1-valued bit that appears in each column.
- uint16_t last1ind[polarParams->crcParityBits];
- for (int j=0; jcrcParityBits; j++) {
- for (int i=0; iK; i++) {
- if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
- }
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i+polarParams->crcParityBits][j];
+ }
+ }
- for (int i=0;i<8;i++) extended_crc_scrambling_pattern[i]=0;
- for (int i=8; icrcParityBits; i++) {
- extended_crc_scrambling_pattern[i]=(n_RNTI>>(23-i))&1;
- }
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
- nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
- /*
- * SCL polar decoder.
- */
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
- for (int i=0; icrcParityBits; i++) {
- for (int j=0; jcrcParityBits; j++) crcChecksum[i][0]=crcChecksum[i][0]+polarParams->crc_generator_matrix[j][i];
- crcChecksum[i][0]=(crcChecksum[i][0]%2);
- }
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
- uint32_t nonFrozenBit=0;
- uint8_t currentListSize=1;
- uint8_t decoderIterationCheck=0;
- int16_t checkCrcBits=-1;
- uint8_t listIndex[2*listSize], copyIndex;
+ for (int i=0; i<8; i++) extended_crc_scrambling_pattern[i]=0;
- for (uint16_t currentBit=0; currentBitN; currentBit++){
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
- } else { //Information or CRC bit.
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+ for (int i=8; icrcParityBits; i++) {
+ extended_crc_scrambling_pattern[i]=(n_RNTI>>(23-i))&1;
+ }
- for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
- bit[j][k][i+currentListSize]=bit[j][k][i];
- llr[j][k][i+currentListSize]=llr[j][k][i];}}}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
- for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
- currentListSize*=2;
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- //Keep only the best "listSize" number of entries.
- if (currentListSize > listSize) {
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
- //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
- uint8_t swaps, tempInd;
- for (uint8_t i = 0; i < listSize; i++) {
- swaps = 0;
- for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
- if (listIndex[j+1] > listIndex[j]) {
- tempInd = listIndex[j];
- listIndex[j] = listIndex[j + 1];
- listIndex[j + 1] = tempInd;
- swaps++;
- }
- }
- if (swaps == 0)
- break;
- }
+ /*
+ * SCL polar decoder.
+ */
- //First, backup the best "listSize" number of entries.
- for (int k=(listSize-1); k>0; k--) {
- for (int i=0; iN; i++) {
- for (int j=0; j<(polarParams->n+1); j++) {
- bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
- llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
- }
- }
- }
- for (int k=(listSize-1); k>0; k--) {
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
- }
- }
- for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ for (int i=0; icrcParityBits; i++) {
+ for (int j=0; jcrcParityBits; j++) crcChecksum[i][0]=crcChecksum[i][0]+polarParams->crc_generator_matrix[j][i];
- //Copy the best "listSize" number of entries to the first indices.
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->N; i++) {
- for (int j = 0; j < (polarParams->n + 1); j++) {
- bit[i][j][k] = bit[i][j][copyIndex];
- llr[i][j][k] = llr[i][j][copyIndex];
- }
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][k]=crcChecksum[i][copyIndex];
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- crcState[k]=crcState[copyIndex];
- }
- currentListSize = listSize;
- }
+ crcChecksum[i][0]=(crcChecksum[i][0]%2);
+ }
- for (int i=0; icrcParityBits; i++) {
- if (last1ind[i]==nonFrozenBit) {
- checkCrcBits=i;
- break;
- }
- }
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
- if ( checkCrcBits > (-1) ) {
- for (uint8_t i = 0; i < currentListSize; i++) {
- if (crcChecksum[checkCrcBits][i]!=extended_crc_scrambling_pattern[checkCrcBits]) {
- crcState[i]=0; //0=False, 1=True
- }
- }
- }
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
- if (decoderIterationCheck==0) {
- //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- return(-1);
- }
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
- nonFrozenBit++;
- decoderIterationCheck=0;
- checkCrcBits=-1;
- }
- }
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
- for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
- if ( crcState[listIndex[i]] == 1 ) {
- for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- //Extract the information bits (û to ĉ)
- nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
- //Deinterleaving (ĉ to b)
- nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- //Remove the CRC (â)
- for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
- break;
- }
- }
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
- /*
- * Return bits.
- */
- nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+ if (swaps == 0)
+ break;
+ }
+
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]!=extended_crc_scrambling_pattern[checkCrcBits]) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
}
void init_polar_deinterleaver_table(t_nrPolar_params *polarParams) {
-
AssertFatal(polarParams->K > 32, "K = %d < 33, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->K < 129, "K = %d > 128, is not supported yet\n",polarParams->K);
-
int bit_i,ip,ipmod64;
-
int numbytes = polarParams->K>>3;
int residue = polarParams->K&7;
int numbits;
+
if (residue>0) numbytes++;
- for (int byte=0;byteK>>3)) numbits=8;
else numbits=residue;
- for (int i=0;iK - 1 - polarParams->interleaving_pattern[(8*byte)+i];
#if 0
@@ -800,53 +1141,54 @@ void init_polar_deinterleaver_table(t_nrPolar_params *polarParams) {
#endif
ipmod64 = ip&63;
AssertFatal(ip<128,"ip = %d\n",ip);
- for (int val=0;val<256;val++) {
- bit_i=(val>>i)&1;
- if (ip<64) polarParams->B_tab0[byte][val] |= (((uint64_t)bit_i)<B_tab1[byte][val] |= (((uint64_t)bit_i)<>i)&1;
+
+ if (ip<64) polarParams->B_tab0[byte][val] |= (((uint64_t)bit_i)<B_tab1[byte][val] |= (((uint64_t)bit_i)<N];// = malloc(sizeof(double) * polarParams->N);
-
nr_polar_rate_matching_int16(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int i=0;iN;i++) {
- if (d_tilde[i]<-128) d_tilde[i]=-128;
- else if (d_tilde[i]>127) d_tilde[i]=127;
+
+ for (int i=0; iN; i++) {
+ if (d_tilde[i]<-128) d_tilde[i]=-128;
+ else if (d_tilde[i]>127) d_tilde[i]=128;
}
- memcpy((void*)&polarParams->tree.root->alpha[0],(void*)&d_tilde[0],sizeof(int16_t)*polarParams->N);
-
- generic_polar_decoder(polarParams, polarParams->tree.root);
-
+ memcpy((void *)&polarParams->tree.root->alpha[0],(void *)&d_tilde[0],sizeof(int16_t)*polarParams->N);
+ generic_polar_decoder(polarParams,polarParams->tree.root);
//Extract the information bits (û to ĉ)
- uint64_t Cprime[4]={0,0,0,0};
- uint64_t B[4]={0,0,0,0};
- for (int i=0;iK;i++) Cprime[i>>6] = Cprime[i>>6] | ((uint64_t)polarParams->nr_polar_U[polarParams->Q_I_N[i]])<<(i&63);
+ uint64_t Cprime[4]= {0,0,0,0};
+ uint64_t B[4]= {0,0,0,0};
+
+ for (int i=0; iK; i++) Cprime[i>>6] = Cprime[i>>6] | ((uint64_t)polarParams->nr_polar_U[polarParams->Q_I_N[i]])<<(i&63);
//Deinterleaving (ĉ to b)
- uint8_t *Cprimebyte = (uint8_t*)Cprime;
+ uint8_t *Cprimebyte = (uint8_t *)Cprime;
+
if (polarParams->K<65) {
B[0] = polarParams->B_tab0[0][Cprimebyte[0]] |
- polarParams->B_tab0[1][Cprimebyte[1]] |
- polarParams->B_tab0[2][Cprimebyte[2]] |
- polarParams->B_tab0[3][Cprimebyte[3]] |
- polarParams->B_tab0[4][Cprimebyte[4]] |
- polarParams->B_tab0[5][Cprimebyte[5]] |
- polarParams->B_tab0[6][Cprimebyte[6]] |
- polarParams->B_tab0[7][Cprimebyte[7]];
- }
- else if (polarParams->K<129) {
+ polarParams->B_tab0[1][Cprimebyte[1]] |
+ polarParams->B_tab0[2][Cprimebyte[2]] |
+ polarParams->B_tab0[3][Cprimebyte[3]] |
+ polarParams->B_tab0[4][Cprimebyte[4]] |
+ polarParams->B_tab0[5][Cprimebyte[5]] |
+ polarParams->B_tab0[6][Cprimebyte[6]] |
+ polarParams->B_tab0[7][Cprimebyte[7]];
+ } else if (polarParams->K<129) {
int len = polarParams->K/8;
+
if ((polarParams->K&7) > 0) len++;
- for (int k=0;kB_tab0[k][Cprimebyte[k]];
B[1] |= polarParams->B_tab1[k][Cprimebyte[k]];
}
@@ -858,41 +1200,38 @@ uint32_t polar_decoder_int16(int16_t *input,
uint64_t rxcrc=B[0]&((1<>crclen);
uint8_t A32_flip[4];
uint32_t Aprime= (uint32_t)(Ar<<(32-len));
- A32_flip[0]=((uint8_t*)&Aprime)[3];
- A32_flip[1]=((uint8_t*)&Aprime)[2];
- A32_flip[2]=((uint8_t*)&Aprime)[1];
- A32_flip[3]=((uint8_t*)&Aprime)[0];
+ A32_flip[0]=((uint8_t *)&Aprime)[3];
+ A32_flip[1]=((uint8_t *)&Aprime)[2];
+ A32_flip[2]=((uint8_t *)&Aprime)[1];
+ A32_flip[3]=((uint8_t *)&Aprime)[0];
crc = (uint64_t)(crc24c(A32_flip,len)>>8);
- }
- else if (len<=64) {
+ } else if (len<=64) {
Ar = (B[0]>>crclen) | (B[1]<<(64-crclen));;
uint8_t A64_flip[8];
uint64_t Aprime= (uint32_t)(Ar<<(64-len));
- A64_flip[0]=((uint8_t*)&Aprime)[7];
- A64_flip[1]=((uint8_t*)&Aprime)[6];
- A64_flip[2]=((uint8_t*)&Aprime)[5];
- A64_flip[3]=((uint8_t*)&Aprime)[4];
- A64_flip[4]=((uint8_t*)&Aprime)[3];
- A64_flip[5]=((uint8_t*)&Aprime)[2];
- A64_flip[6]=((uint8_t*)&Aprime)[1];
- A64_flip[7]=((uint8_t*)&Aprime)[0];
+ A64_flip[0]=((uint8_t *)&Aprime)[7];
+ A64_flip[1]=((uint8_t *)&Aprime)[6];
+ A64_flip[2]=((uint8_t *)&Aprime)[5];
+ A64_flip[3]=((uint8_t *)&Aprime)[4];
+ A64_flip[4]=((uint8_t *)&Aprime)[3];
+ A64_flip[5]=((uint8_t *)&Aprime)[2];
+ A64_flip[6]=((uint8_t *)&Aprime)[1];
+ A64_flip[7]=((uint8_t *)&Aprime)[0];
crc = (uint64_t)(crc24c(A64_flip,len)>>8);
}
#if 0
printf("A %llx B %llx|%llx Cprime %llx|%llx (crc %x,rxcrc %llx %d)\n",
- Ar,
- B[1],B[0],Cprime[1],Cprime[0],crc,
- rxcrc,polarParams->payloadBits);
+ Ar,
+ B[1],B[0],Cprime[1],Cprime[0],crc,
+ rxcrc,polarParams->payloadBits);
#endif
-
out[0]=Ar;
-
return(crc^rxcrc);
}
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
index 9f8fac24c5..38f78bc47b 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
@@ -184,14 +184,7 @@ void updateCrcChecksum2(uint8_t **crcChecksum,
}
}
-void build_decoder_tree(t_nrPolar_params *polarParams)
-{
- polarParams->tree.num_nodes=0;
- polarParams->tree.root = add_nodes(polarParams->n,0,polarParams);
-#ifdef DEBUG_NEW_IMPL
- printf("root : left %p, right %p\n",polarParams->tree.root->left,polarParams->tree.root->right);
-#endif
-}
+
decoder_node_t *new_decoder_node(int first_leaf_index, int level) {
@@ -253,6 +246,15 @@ decoder_node_t *add_nodes(int level, int first_leaf_index, t_nrPolar_params *pol
return(new_node);
}
+void build_decoder_tree(t_nrPolar_params *polarParams)
+{
+ polarParams->tree.num_nodes=0;
+ polarParams->tree.root = add_nodes(polarParams->n,0,polarParams);
+#ifdef DEBUG_NEW_IMPL
+ printf("root : left %p, right %p\n",polarParams->tree.root->left,polarParams->tree.root->right);
+#endif
+}
+
#if defined(__arm__) || defined(__aarch64__)
// translate 1-1 SIMD functions from SSE to NEON
#define __m128i int16x8_t
@@ -512,17 +514,19 @@ void computeBeta(t_nrPolar_params *pp,decoder_node_t *node) {
memcpy((void*)&betav[node->Nv/2],betar,(node->Nv/2)*sizeof(int16_t));
}
-void generic_polar_decoder(t_nrPolar_params *polarParams, decoder_node_t *node) {
+void generic_polar_decoder(const t_nrPolar_params *pp,decoder_node_t *node) {
+
// Apply F to left
- applyFtoleft(polarParams, node);
+ applyFtoleft(pp, node);
// if left is not a leaf recurse down to the left
if (node->left->leaf==0)
- generic_polar_decoder(polarParams, node->left);
+ generic_polar_decoder(pp, node->left);
- applyGtoright(polarParams, node);
- if (node->right->leaf==0) generic_polar_decoder(polarParams, node->right);
+ applyGtoright(pp, node);
+ if (node->right->leaf==0) generic_polar_decoder(pp, node->right);
- computeBeta(polarParams, node);
+ computeBeta(pp, node);
}
+
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
index 76f1c322fe..f6c66e89dc 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
@@ -80,7 +80,7 @@ struct nrPolar_params {
//messageType: 0=PBCH, 1=DCI, -1=UCI
int idx; //idx = (messageType * messageLength * aggregation_prime);
struct nrPolar_params *nextPtr;
-
+
uint8_t n_max;
uint8_t i_il;
uint8_t i_seg;
@@ -95,7 +95,7 @@ struct nrPolar_params {
uint16_t N;
uint8_t n;
uint32_t crcBit;
-
+
uint16_t *interleaving_pattern;
uint16_t *deinterleaving_pattern;
uint16_t *rate_matching_pattern;
@@ -106,7 +106,7 @@ struct nrPolar_params {
uint8_t *information_bit_pattern;
uint16_t *channel_interleaver_pattern;
uint32_t crc_polynomial;
-
+
uint8_t **crc_generator_matrix; //G_P
uint8_t **G_N;
uint64_t **G_N_tab;
@@ -116,7 +116,7 @@ struct nrPolar_params {
uint64_t cprime_tab1[32][256];
uint64_t B_tab0[32][256];
uint64_t B_tab1[32][256];
- uint32_t* crc256Table;
+ uint32_t *crc256Table;
uint8_t **extended_crc_generator_matrix;
//lowercase: bits, Uppercase: Bits stored in bytes
//polar_encoder vectors
@@ -125,93 +125,82 @@ struct nrPolar_params {
uint8_t *nr_polar_APrime;
uint8_t *nr_polar_D;
uint8_t *nr_polar_E;
-
+
//Polar Coding vectors
uint8_t *nr_polar_A;
uint8_t *nr_polar_CPrime;
uint8_t *nr_polar_B;
uint8_t *nr_polar_U;
-
+
decoder_tree_t tree;
} __attribute__ ((__packed__));
typedef struct nrPolar_params t_nrPolar_params;
-typedef t_nrPolar_params *t_nrPolar_paramsPtr;
void polar_encoder(uint32_t *input,
- uint32_t *output,
- t_nrPolar_paramsPtr polarParams);
+ uint32_t *output,
+ t_nrPolar_params *polarParams);
void polar_encoder_dci(uint32_t *in,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint16_t n_RNTI);
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint16_t n_RNTI);
-void polar_encoder_fast(uint64_t *Aprime,
- uint32_t *out,
- int32_t crcmask,
- t_nrPolar_paramsPtr polarParams);
+void polar_encoder_fast(uint64_t *A,
+ uint32_t *out,
+ int32_t crcmask,
+ t_nrPolar_params *polarParams);
int8_t polar_decoder(double *input,
- uint8_t *output,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr);
-
-int8_t polar_decoder_aPriori(double *input,
- uint32_t *output,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- double *aPrioriPayload);
-
-int8_t polar_decoder_dci(double *input,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- uint16_t n_RNTI);
+ uint8_t *output,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr);
uint32_t polar_decoder_int16(int16_t *input,
- uint64_t *out,
- t_nrPolar_params *polarParams);
+ uint64_t *out,
+ const t_nrPolar_params *polarParams);
-void generic_polar_decoder(t_nrPolar_params *, decoder_node_t *);
+int8_t polar_decoder_aPriori(double *input,
+ uint32_t *output,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload);
-void applyFtoleft(t_nrPolar_params *polarParams, decoder_node_t *node);
+int8_t polar_decoder_aPriori_timing(double *input,
+ uint32_t *output,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload,
+ double cpuFreqGHz,
+ FILE *logFile);
-void applyGtoright(t_nrPolar_params *polarParams, decoder_node_t *node);
+int8_t polar_decoder_dci(double *input,
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ uint16_t n_RNTI);
-void computeBeta(t_nrPolar_params *polarParams, decoder_node_t *node);
-
-
-void build_decoder_tree(t_nrPolar_params *polarParams);
-
-decoder_node_t *new_decoder_node(int first_leaf_index, int level);
-
-decoder_node_t *add_nodes(int level, int first_leaf_index, t_nrPolar_params *polarParams);
-
-
-void build_polar_tables(t_nrPolar_paramsPtr polarParams);
+void generic_polar_decoder(const t_nrPolar_params *,
+ decoder_node_t *);
+void build_decoder_tree(t_nrPolar_params *pp);
+void build_polar_tables(t_nrPolar_params *polarParams);
void init_polar_deinterleaver_table(t_nrPolar_params *polarParams);
-void nr_polar_init(t_nrPolar_paramsPtr *polarParams,
- int8_t messageType,
- uint16_t messageLength,
- uint8_t aggregation_level);
+void nr_polar_print_polarParams(t_nrPolar_params *polarParams);
-void nr_polar_print_polarParams(t_nrPolar_paramsPtr polarParams);
-
-t_nrPolar_paramsPtr nr_polar_params (t_nrPolar_paramsPtr polarParams,
- int8_t messageType,
- uint16_t messageLength,
- uint8_t aggregation_level);
+t_nrPolar_params *nr_polar_params ( int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level);
-uint8_t** nr_polar_kronecker_power_matrices(uint8_t n);
+uint8_t **nr_polar_kronecker_power_matrices(uint8_t n);
-const uint16_t* nr_polar_sequence_pattern(uint8_t n);
+const uint16_t *nr_polar_sequence_pattern(uint8_t n);
/*!@fn uint32_t nr_polar_output_length(uint16_t K, uint16_t E, uint8_t n_max)
* @brief Computes...
@@ -219,143 +208,167 @@ const uint16_t* nr_polar_sequence_pattern(uint8_t n);
* @param E
* @param n_max */
uint32_t nr_polar_output_length(uint16_t K,
- uint16_t E,
- uint8_t n_max);
+ uint16_t E,
+ uint8_t n_max);
void nr_polar_channel_interleaver_pattern(uint16_t *cip,
- uint8_t I_BIL,
- uint16_t E);
+ uint8_t I_BIL,
+ uint16_t E);
void nr_polar_rate_matching_pattern(uint16_t *rmp,
- uint16_t *J,
- const uint8_t *P_i_,
- uint16_t K,
- uint16_t N,
- uint16_t E);
+ uint16_t *J,
+ const uint8_t *P_i_,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E);
void nr_polar_rate_matching(double *input,
- double *output,
- uint16_t *rmp,
- uint16_t K,
- uint16_t N,
- uint16_t E);
+ double *output,
+ uint16_t *rmp,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E);
void nr_polar_rate_matching_int16(int16_t *input,
- int16_t *output,
- uint16_t *rmp,
- uint16_t K,
- uint16_t N,
- uint16_t E);
+ int16_t *output,
+ uint16_t *rmp,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E);
-void nr_polar_interleaving_pattern(uint16_t K, uint8_t I_IL, uint16_t *PI_k_);
+void nr_polar_interleaving_pattern(uint16_t K,
+ uint8_t I_IL,
+ uint16_t *PI_k_);
void nr_polar_info_bit_pattern(uint8_t *ibp,
- int16_t *Q_I_N,
- int16_t *Q_F_N,
- uint16_t *J,
- const uint16_t *Q_0_Nminus1,
- uint16_t K,
- uint16_t N,
- uint16_t E,
- uint8_t n_PC);
+ int16_t *Q_I_N,
+ int16_t *Q_F_N,
+ uint16_t *J,
+ const uint16_t *Q_0_Nminus1,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E,
+ uint8_t n_PC);
void nr_polar_info_bit_extraction(uint8_t *input,
- uint8_t *output,
- uint8_t *pattern,
- uint16_t size);
+ uint8_t *output,
+ uint8_t *pattern,
+ uint16_t size);
-void nr_bit2byte_uint32_8(uint32_t *in, uint16_t arraySize, uint8_t *out);
+void nr_bit2byte_uint32_8(uint32_t *in,
+ uint16_t arraySize,
+ uint8_t *out);
-void nr_byte2bit_uint8_32(uint8_t *in, uint16_t arraySize, uint32_t *out);
+void nr_byte2bit_uint8_32(uint8_t *in,
+ uint16_t arraySize,
+ uint32_t *out);
-void nr_crc_bit2bit_uint32_8(uint32_t *in, uint16_t arraySize, uint8_t *out);
+void nr_crc_bit2bit_uint32_8(uint32_t *in,
+ uint16_t arraySize,
+ uint8_t *out);
void nr_polar_bit_insertion(uint8_t *input,
- uint8_t *output,
- uint16_t N,
- uint16_t K,
- int16_t *Q_I_N,
- int16_t *Q_PC_N,
- uint8_t n_PC);
+ uint8_t *output,
+ uint16_t N,
+ uint16_t K,
+ int16_t *Q_I_N,
+ int16_t *Q_PC_N,
+ uint8_t n_PC);
void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1,
- uint8_t **matrix2,
- uint8_t *output,
- uint16_t row,
- uint16_t col);
+ uint8_t **matrix2,
+ uint8_t *output,
+ uint16_t row,
+ uint16_t col);
-uint8_t ***nr_alloc_uint8_3D_array(uint16_t xlen, uint16_t ylen, uint16_t zlen);
+uint8_t ***nr_alloc_uint8_3D_array(uint16_t xlen,
+ uint16_t ylen,
+ uint16_t zlen);
-uint8_t **nr_alloc_uint8_2D_array(uint16_t xlen, uint16_t ylen);
+uint8_t **nr_alloc_uint8_2D_array(uint16_t xlen,
+ uint16_t ylen);
-double ***nr_alloc_double_3D_array(uint16_t xlen, uint16_t ylen, uint16_t zlen);
+double ***nr_alloc_double_3D_array(uint16_t xlen,
+ uint16_t ylen,
+ uint16_t zlen);
-double **nr_alloc_double_2D_array(uint16_t xlen, uint16_t ylen);
+double **nr_alloc_double_2D_array(uint16_t xlen,
+ uint16_t ylen);
-void nr_free_double_3D_array(double ***input, uint16_t xlen, uint16_t ylen);
+void nr_free_double_3D_array(double ***input,
+ uint16_t xlen,
+ uint16_t ylen);
-void nr_free_double_2D_array(double **input, uint16_t xlen);
+void nr_free_double_2D_array(double **input,
+ uint16_t xlen);
-void nr_free_uint8_3D_array(uint8_t ***input, uint16_t xlen, uint16_t ylen);
+void nr_free_uint8_3D_array(uint8_t ***input,
+ uint16_t xlen,
+ uint16_t ylen);
-void nr_free_uint8_2D_array(uint8_t **input, uint16_t xlen);
+void nr_free_uint8_2D_array(uint8_t **input,
+ uint16_t xlen);
-void nr_sort_asc_double_1D_array_ind(double *matrix, uint8_t *ind, uint8_t len);
+void nr_sort_asc_double_1D_array_ind(double *matrix,
+ uint8_t *ind,
+ uint8_t len);
-void nr_sort_asc_int16_1D_array_ind(int32_t *matrix, int *ind, int len);
+void nr_sort_asc_int16_1D_array_ind(int32_t *matrix,
+ int *ind,
+ int len);
void nr_free_double_2D_array(double **input, uint16_t xlen);
void updateLLR(double ***llr,
- uint8_t **llrU,
- uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen,
- uint8_t approximation);
+ uint8_t **llrU,
+ uint8_t ***bit,
+ uint8_t **bitU,
+ uint8_t listSize,
+ uint16_t row,
+ uint16_t col,
+ uint16_t xlen,
+ uint8_t ylen,
+ uint8_t approximation);
void updateBit(uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen);
+ uint8_t **bitU,
+ uint8_t listSize,
+ uint16_t row,
+ uint16_t col,
+ uint16_t xlen,
+ uint8_t ylen);
void updatePathMetric(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint8_t bitValue,
- uint16_t row,
- uint8_t approximation);
+ double ***llr,
+ uint8_t listSize,
+ uint8_t bitValue,
+ uint16_t row,
+ uint8_t approximation);
void updatePathMetric2(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint16_t row,
- uint8_t approximation);
+ double ***llr,
+ uint8_t listSize,
+ uint16_t row,
+ uint8_t approximation);
void computeLLR(double ***llr,
- uint16_t row,
- uint16_t col,
- uint8_t i,
- uint16_t offset,
- uint8_t approximation);
+ uint16_t row,
+ uint16_t col,
+ uint8_t i,
+ uint16_t offset,
+ uint8_t approximation);
void updateCrcChecksum(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len);
+ uint8_t **crcGen,
+ uint8_t listSize,
+ uint32_t i2,
+ uint8_t len);
void updateCrcChecksum2(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len);
+ uint8_t **crcGen,
+ uint8_t listSize,
+ uint32_t i2,
+ uint8_t len);
uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits);
@@ -364,14 +377,20 @@ uint8_t **crc11_generator_matrix(uint16_t payloadSizeBits);
uint8_t **crc6_generator_matrix(uint16_t payloadSizeBits);
//Also nr_polar_rate_matcher
-static inline void nr_polar_interleaver(uint8_t *input, uint8_t *output, uint16_t *pattern, uint16_t size){
- for (int i=0; iidx == 0){//PBCH
+ uint32_t *out,
+ t_nrPolar_params *polarParams) {
+ if (1) {//polarParams->idx == 0 || polarParams->idx == 1) { //PBCH or PDCCH
/*
uint64_t B = (((uint64_t)*in)&((((uint64_t)1)<<32)-1)) | (((uint64_t)crc24c((uint8_t*)in,polarParams->payloadBits)>>8)<payloadBits);
-#ifdef DEBUG_POLAR_ENCODER
+ #ifdef DEBUG_POLAR_ENCODER
printf("polar_B %llx (crc %x)\n",B,crc24c((uint8_t*)in,polarParams->payloadBits)>>8);
-#endif
-nr_bit2byte_uint32_8((uint32_t*)&B, polarParams->K, polarParams->nr_polar_B);*/
-
- nr_bit2byte_uint32_8((uint32_t*)in, polarParams->payloadBits, polarParams->nr_polar_A);
+ #endif
+ nr_bit2byte_uint32_8_t((uint32_t*)&B, polarParams->K, polarParams->nr_polar_B);*/
+ nr_bit2byte_uint32_8((uint32_t *)in, polarParams->payloadBits, polarParams->nr_polar_A);
/*
* Bytewise operations
*/
//Calculate CRC.
-
- nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_A,
- polarParams->crc_generator_matrix,
- polarParams->nr_polar_crc,
- polarParams->payloadBits,
- polarParams->crcParityBits);
- for (uint8_t i = 0; i < polarParams->crcParityBits; i++)
- polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
-
-
- //Attach CRC to the Transport Block. (a to b)
- for (uint16_t i = 0; i < polarParams->payloadBits; i++)
- polarParams->nr_polar_B[i] = polarParams->nr_polar_A[i];
- for (uint16_t i = polarParams->payloadBits; i < polarParams->K; i++)
- polarParams->nr_polar_B[i]= polarParams->nr_polar_crc[i-(polarParams->payloadBits)];
-
+ nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_A,
+ polarParams->crc_generator_matrix,
+ polarParams->nr_polar_crc,
+ polarParams->payloadBits,
+ polarParams->crcParityBits);
+
+ for (uint8_t i = 0; i < polarParams->crcParityBits; i++)
+ polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
+
+ //Attach CRC to the Transport Block. (a to b)
+ for (uint16_t i = 0; i < polarParams->payloadBits; i++)
+ polarParams->nr_polar_B[i] = polarParams->nr_polar_A[i];
+
+ for (uint16_t i = polarParams->payloadBits; i < polarParams->K; i++)
+ polarParams->nr_polar_B[i]= polarParams->nr_polar_crc[i-(polarParams->payloadBits)];
+
#ifdef DEBUG_POLAR_ENCODER
uint64_t B2=0;
- for (int i = 0;iK;i++) B2 = B2 | ((uint64_t)polarParams->nr_polar_B[i] << i);
+
+ for (int i = 0; iK; i++) B2 = B2 | ((uint64_t)polarParams->nr_polar_B[i] << i);
+
printf("polar_B %llx\n",B2);
#endif
/* for (int j=0;jcrcParityBits;j++) {
- for (int i=0;ipayloadBits;i++)
- printf("%1d.%1d+",polarParams->crc_generator_matrix[i][j],polarParams->nr_polar_A[i]);
+ for (int i=0;ipayloadBits;i++)
+ printf("%1d.%1d+",polarParams->crc_generator_matrix[i][j],polarParams->nr_polar_A[i]);
printf(" => %d\n",polarParams->nr_polar_crc[j]);
}*/
-
} else { //UCI
-
}
//Interleaving (c to c')
nr_polar_interleaver(polarParams->nr_polar_B,
- polarParams->nr_polar_CPrime,
- polarParams->interleaving_pattern,
- polarParams->K);
-
-
-#ifdef DEBUG_POLAR_ENCODER
+ polarParams->nr_polar_CPrime,
+ polarParams->interleaving_pattern,
+ polarParams->K);
+#ifdef DEBUG_POLAR_ENCODER
uint64_t Cprime=0;
- for (int i = 0;iK;i++) {
+
+ for (int i = 0; iK; i++) {
Cprime = Cprime | ((uint64_t)polarParams->nr_polar_CPrime[i] << i);
+
if (polarParams->nr_polar_CPrime[i] == 1) printf("pos %d : %llx\n",i,Cprime);
}
+
printf("polar_Cprime %llx\n",Cprime);
-#endif
+#endif
//Bit insertion (c' to u)
nr_polar_bit_insertion(polarParams->nr_polar_CPrime,
- polarParams->nr_polar_U,
- polarParams->N,
- polarParams->K,
- polarParams->Q_I_N,
- polarParams->Q_PC_N,
- polarParams->n_pc);
-
+ polarParams->nr_polar_U,
+ polarParams->N,
+ polarParams->K,
+ polarParams->Q_I_N,
+ polarParams->Q_PC_N,
+ polarParams->n_pc);
//Encoding (u to d)
/* memset(polarParams->nr_polar_U,0,polarParams->N);
polarParams->nr_polar_U[247]=1;
polarParams->nr_polar_U[253]=1;*/
nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_U,
- polarParams->G_N,
- polarParams->nr_polar_D,
- polarParams->N,
- polarParams->N);
+ polarParams->G_N,
+ polarParams->nr_polar_D,
+ polarParams->N,
+ polarParams->N);
+
for (uint16_t i = 0; i < polarParams->N; i++)
polarParams->nr_polar_D[i] = (polarParams->nr_polar_D[i] % 2);
uint64_t D[8];
- memset((void*)D,0,8*sizeof(int64_t));
+ memset((void *)D,0,8*sizeof(int64_t));
#ifdef DEBUG_POLAR_ENCODER
- for (int i=0;iN;i++) D[i/64] |= ((uint64_t)polarParams->nr_polar_D[i])<<(i&63);
- printf("D %llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",
- D[0],D[1],D[2],D[3],D[4],D[5],D[6],D[7]);
-#endif
+ for (int i=0; iN; i++) D[i/64] |= ((uint64_t)polarParams->nr_polar_D[i])<<(i&63);
+
+ printf("D %llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",
+ D[0],D[1],D[2],D[3],D[4],D[5],D[6],D[7]);
+#endif
//Rate matching
//Sub-block interleaving (d to y) and Bit selection (y to e)
nr_polar_interleaver(polarParams->nr_polar_D,
- polarParams->nr_polar_E,
- polarParams->rate_matching_pattern,
- polarParams->encoderLength);
-
+ polarParams->nr_polar_E,
+ polarParams->rate_matching_pattern,
+ polarParams->encoderLength);
/*
* Return bits.
*/
#ifdef DEBUG_POLAR_ENCODER
- for (int i=0; i< polarParams->encoderLength;i++) printf("f[%d]=%d\n", i, polarParams->nr_polar_E[i]);
-#endif
+ for (int i=0; i< polarParams->encoderLength; i++) printf("f[%d]=%d\n", i, polarParams->nr_polar_E[i]);
+
+#endif
nr_byte2bit_uint8_32(polarParams->nr_polar_E, polarParams->encoderLength, out);
}
void polar_encoder_dci(uint32_t *in,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint16_t n_RNTI)
-{
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint16_t n_RNTI) {
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] in: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n", in[0], in[1], in[2], in[3]);
#endif
-
/*
* Bytewise operations
*/
//(a to a')
nr_bit2byte_uint32_8(in, polarParams->payloadBits, polarParams->nr_polar_A);
+
for (int i=0; icrcParityBits; i++) polarParams->nr_polar_APrime[i]=1;
+
for (int i=0; ipayloadBits; i++) polarParams->nr_polar_APrime[i+(polarParams->crcParityBits)]=polarParams->nr_polar_A[i];
+
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] A: ");
+
for (int i=0; ipayloadBits; i++) printf("%d-", polarParams->nr_polar_A[i]);
+
printf("\n");
printf("[polar_encoder_dci] APrime: ");
+
for (int i=0; iK; i++) printf("%d-", polarParams->nr_polar_APrime[i]);
+
printf("\n");
printf("[polar_encoder_dci] GP: ");
+
for (int i=0; icrcParityBits; i++) printf("%d-", polarParams->crc_generator_matrix[0][i]);
+
printf("\n");
#endif
//Calculate CRC.
nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_APrime,
- polarParams->crc_generator_matrix,
- polarParams->nr_polar_crc,
- polarParams->K,
- polarParams->crcParityBits);
+ polarParams->crc_generator_matrix,
+ polarParams->nr_polar_crc,
+ polarParams->K,
+ polarParams->crcParityBits);
+
for (uint8_t i = 0; i < polarParams->crcParityBits; i++) polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
+
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] CRC: ");
+
for (int i=0; icrcParityBits; i++) printf("%d-", polarParams->nr_polar_crc[i]);
+
printf("\n");
#endif
//Attach CRC to the Transport Block. (a to b)
for (uint16_t i = 0; i < polarParams->payloadBits; i++)
polarParams->nr_polar_B[i] = polarParams->nr_polar_A[i];
+
for (uint16_t i = polarParams->payloadBits; i < polarParams->K; i++)
polarParams->nr_polar_B[i]= polarParams->nr_polar_crc[i-(polarParams->payloadBits)];
+
//Scrambling (b to c)
for (int i=0; i<16; i++) {
polarParams->nr_polar_B[polarParams->payloadBits+8+i] =
( polarParams->nr_polar_B[polarParams->payloadBits+8+i] + ((n_RNTI>>(15-i))&1) ) % 2;
}
- /* //(a to a')
- nr_crc_bit2bit_uint32_8(in, polarParams->payloadBits, polarParams->nr_polar_aPrime);
- //Parity bits computation (p)
- polarParams->crcBit = crc24c(polarParams->nr_polar_aPrime, (polarParams->payloadBits+polarParams->crcParityBits));
- #ifdef DEBUG_POLAR_ENCODER_DCI
- printf("[polar_encoder_dci] crc: 0x%08x\n", polarParams->crcBit);
- for (int i=0; i<32; i++)
- {
- printf("%d\n",((polarParams->crcBit)>>i)&1);
- }
- #endif
- //(a to b)
- //
- // Bytewise operations
- //
- uint8_t arrayInd = ceil(polarParams->payloadBits / 8.0);
- for (int i=0; inr_polar_B[j+(i*8)] = ((polarParams->nr_polar_aPrime[3+i]>>(7-j)) & 1);
- }
- }
- for (int i=0; i<((polarParams->payloadBits)%8); i++) {
- polarParams->nr_polar_B[i+(arrayInd-1)*8] = ((polarParams->nr_polar_aPrime[3+(arrayInd-1)]>>(7-i)) & 1);
- }
- for (int i=0; i<8; i++) {
- polarParams->nr_polar_B[polarParams->payloadBits+i] = ((polarParams->crcBit)>>(31-i))&1;
- }
- //Scrambling (b to c)
- for (int i=0; i<16; i++) {
- polarParams->nr_polar_B[polarParams->payloadBits+8+i] =
- ( (((polarParams->crcBit)>>(23-i))&1) + ((n_RNTI>>(15-i))&1) ) % 2;
- }*/
+ /* //(a to a')
+ nr_crc_bit2bit_uint32_8_t(in, polarParams->payloadBits, polarParams->nr_polar_aPrime);
+ //Parity bits computation (p)
+ polarParams->crcBit = crc24c(polarParams->nr_polar_aPrime, (polarParams->payloadBits+polarParams->crcParityBits));
+ #ifdef DEBUG_POLAR_ENCODER_DCI
+ printf("[polar_encoder_dci] crc: 0x%08x\n", polarParams->crcBit);
+ for (int i=0; i<32; i++)
+ {
+ printf("%d\n",((polarParams->crcBit)>>i)&1);
+ }
+ #endif
+ //(a to b)
+ //
+ // Bytewise operations
+ //
+ uint8_t arrayInd = ceil(polarParams->payloadBits / 8.0);
+ for (int i=0; inr_polar_B[j+(i*8)] = ((polarParams->nr_polar_aPrime[3+i]>>(7-j)) & 1);
+ }
+ }
+ for (int i=0; i<((polarParams->payloadBits)%8); i++) {
+ polarParams->nr_polar_B[i+(arrayInd-1)*8] = ((polarParams->nr_polar_aPrime[3+(arrayInd-1)]>>(7-i)) & 1);
+ }
+ for (int i=0; i<8; i++) {
+ polarParams->nr_polar_B[polarParams->payloadBits+i] = ((polarParams->crcBit)>>(31-i))&1;
+ }
+ //Scrambling (b to c)
+ for (int i=0; i<16; i++) {
+ polarParams->nr_polar_B[polarParams->payloadBits+8+i] =
+ ( (((polarParams->crcBit)>>(23-i))&1) + ((n_RNTI>>(15-i))&1) ) % 2;
+ }*/
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] B: ");
+
for (int i = 0; i < polarParams->K; i++) printf("%d-", polarParams->nr_polar_B[i]);
+
printf("\n");
#endif
-
//Interleaving (c to c')
nr_polar_interleaver(polarParams->nr_polar_B,
- polarParams->nr_polar_CPrime,
- polarParams->interleaving_pattern,
- polarParams->K);
-
+ polarParams->nr_polar_CPrime,
+ polarParams->interleaving_pattern,
+ polarParams->K);
//Bit insertion (c' to u)
nr_polar_bit_insertion(polarParams->nr_polar_CPrime,
- polarParams->nr_polar_U,
- polarParams->N,
- polarParams->K,
- polarParams->Q_I_N,
- polarParams->Q_PC_N,
- polarParams->n_pc);
-
+ polarParams->nr_polar_U,
+ polarParams->N,
+ polarParams->K,
+ polarParams->Q_I_N,
+ polarParams->Q_PC_N,
+ polarParams->n_pc);
//Encoding (u to d)
nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_U,
- polarParams->G_N,
- polarParams->nr_polar_D,
- polarParams->N,
- polarParams->N);
+ polarParams->G_N,
+ polarParams->nr_polar_D,
+ polarParams->N,
+ polarParams->N);
+
for (uint16_t i = 0; i < polarParams->N; i++)
polarParams->nr_polar_D[i] = (polarParams->nr_polar_D[i] % 2);
//Rate matching
//Sub-block interleaving (d to y) and Bit selection (y to e)
nr_polar_interleaver(polarParams->nr_polar_D,
- polarParams->nr_polar_E,
- polarParams->rate_matching_pattern,
- polarParams->encoderLength);
-
+ polarParams->nr_polar_E,
+ polarParams->rate_matching_pattern,
+ polarParams->encoderLength);
/*
* Return bits.
*/
nr_byte2bit_uint8_32(polarParams->nr_polar_E, polarParams->encoderLength, out);
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] E: ");
+
for (int i = 0; i < polarParams->encoderLength; i++) printf("%d-", polarParams->nr_polar_E[i]);
+
uint8_t outputInd = ceil(polarParams->encoderLength / 32.0);
printf("\n[polar_encoder_dci] out: ");
+
for (int i = 0; i < outputInd; i++) {
printf("[%d]->0x%08x\t", i, out[i]);
}
+
#endif
}
-static inline void polar_rate_matching(t_nrPolar_paramsPtr polarParams,void *in,void *out) __attribute__((always_inline));
+static inline void polar_rate_matching(t_nrPolar_params *polarParams,void *in,void *out) __attribute__((always_inline));
-static inline void polar_rate_matching(t_nrPolar_paramsPtr polarParams,void *in,void *out) {
+static inline void polar_rate_matching(t_nrPolar_params *polarParams,void *in,void *out) {
- if (polarParams->groupsize == 8)
- for (int i=0;iencoderLength>>3;i++) ((uint8_t*)out)[i] = ((uint8_t *)in)[polarParams->rm_tab[i]];
- else
- for (int i=0;iencoderLength>>4;i++) {
- ((uint16_t*)out)[i] = ((uint16_t *)in)[polarParams->rm_tab[i]];
+ // handle rate matching with a single 128 bit word using bit shuffling
+ // can be done with SIMD intrisics if needed
+ if (polarParams->groupsize < 8) {
+ AssertFatal(polarParams->encoderLength<=128,"Need to handle groupsize<8 and N>128\n");
+ uint128_t *out128=(uint128_t*)out;
+ uint128_t *in128=(uint128_t*)in;
+ *out128=0;
+ uint128_t tmp0;
+#ifdef DEBUG_POLAR_ENCODER
+ uint128_t tmp1;
+#endif
+ for (int i=0; iencoderLength; i++) {
+#ifdef DEBUG_POLAR_ENCODER
+ printf("%u<-%u : %llx.%llx =>",i,polarParams->rate_matching_pattern[i],((uint64_t *)out)[1],((uint64_t *)out)[0]);
+#endif
+ tmp0 = (*in128&(((uint128_t)1)<rate_matching_pattern[i]));
+ if (tmp0!=0) {
+ *out128 = *out128 | ((uint128_t)1)<%llx.%llx => %llx.%llx\n",
+ ((uint64_t *)&tmp0)[1],((uint64_t *)&tmp0)[0],
+ ((uint64_t *)&tmp1)[1],((uint64_t *)&tmp1)[0],
+ ((uint64_t *)out)[1],((uint64_t *)out)[0]);
+#endif
+ }
+ }
+
+ }
+ // These are based on LUTs for byte and short word groups
+ else if (polarParams->groupsize == 8)
+ for (int i=0; iencoderLength>>3; i++) ((uint8_t *)out)[i] = ((uint8_t *)in)[polarParams->rm_tab[i]];
+ else // groupsize==16
+ for (int i=0; iencoderLength>>4; i++) {
+ ((uint16_t *)out)[i] = ((uint16_t *)in)[polarParams->rm_tab[i]];
}
}
-void build_polar_tables(t_nrPolar_paramsPtr polarParams) {
-
+void build_polar_tables(t_nrPolar_params *polarParams) {
// build table b -> c'
-
AssertFatal(polarParams->K > 32, "K = %d < 33, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->K < 129, "K = %d > 64, is not supported yet\n",polarParams->K);
-
int bit_i,ip;
-
int numbytes = polarParams->K>>3;
int residue = polarParams->K&7;
int numbits;
+
if (residue>0) numbytes++;
- for (int byte=0;byteK>>3)) numbits=8;
else numbits=residue;
- for (int val=0;val<256;val++) {
+
+ for (int val=0; val<256; val++) {
polarParams->cprime_tab0[byte][val] = 0;
polarParams->cprime_tab1[byte][val] = 0;
- for (int i=0;ideinterleaving_pattern[polarParams->K-1-((8*byte)+i)];
- AssertFatal(ip<128,"ip = %d\n",ip);
- bit_i=(val>>i)&1;
- if (ip<64) polarParams->cprime_tab0[byte][val] |= (((uint64_t)bit_i)<cprime_tab1[byte][val] |= (((uint64_t)bit_i)<<(ip&63));
+
+ for (int i=0; i