Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration

Conflicts: cmake_targets/CMakeLists.txt executables/nr-gnb.c nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_mPass.h openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h openair1/PHY/INIT/nr_init_ue.c openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c openair1/PHY/NR_UE_TRANSPORT/nr_prach.c openair2/COMMON/rrc_messages_types.h openair2/GNB_APP/gnb_config.c openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c openair2/LAYER2/NR_MAC_gNB/config.c openair2/NR_PHY_INTERFACE/NR_IF_Module.c openair2/RRC/NR/MESSAGES/asn1_msg.c openair2/RRC/NR/nr_rrc_defs.h openair2/RRC/NR/rrc_gNB.c
2019-10-10 12:29:20 +02:00
parent db8822a8d8 6548ae15d2
commit d554707919
1087 changed files with 22301 additions and 27849 deletions
@@ -44,7 +44,7 @@ pipeline {
        disableConcurrentBuilds()
        timestamps()
        gitLabConnection('OAI GitLab')
-        gitlabBuilds(builds: ["Build gNB-USRP", "Build nr-UE-USRP", "Build eNB-USRP", "Build basic-sim", "Build phy-sim", "Build eNB-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13", "Test-Mono-FDD-Band13-X2-HO"])
+        gitlabBuilds(builds: ["Build gNB-USRP", "Build nr-UE-USRP", "Build eNB-USRP", "Build basic-sim", "Build phy-sim", "Build eNB-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13", "Test-Mono-FDD-Band13-X2-HO", "Test-TDD-Band78-gNB-NR-UE"])
        ansiColor('xterm')
    }

@@ -362,7 +362,7 @@ pipeline {
                        stage ("Test physical simulators") {
                            steps {
                                script {
-                                    timeout (time: 20, unit: 'MINUTES') {
+                                    timeout (time: 45, unit: 'MINUTES') {
                                        try {
                                            gitlabCommitStatus(name: "Test phy-sim") {
                                                sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
@@ -615,6 +615,25 @@ pipeline {
                        }
                    }
                }
+                stage ("Test OAI NR UE - OAI gNB - TDD - Band 78 - N300") {
+                    steps {
+                        script {
+                            triggerSlaveJob ('gNB-nrUE-MONO-TDD-Band78-N300', 'Test-TDD-Band78-gNB-NR-UE')
+                        }
+                    }
+                    post {
+                        always {
+                            script {
+                                finalizeSlaveJob('gNB-nrUE-MONO-TDD-Band78-N300')
+                            }
+                        }
+                        failure {
+                            script {
+                                currentBuild.result = 'FAILURE'
+                            }
+                        }
+                    }
+                }
            }
            post {
                always {
@@ -51,14 +51,10 @@ def eNB_Repository
 def eNB_Branch
 def eNB_CommitID
 def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-def PROJECT_NAME = "test-boris"
-def GIT_COMMIT_AUTHORi
+def eNB_TargetBranch = "develop-nr"
+def GIT_COMMIT_AUTHOR
 def GIT_COMMIT_EMAIL
 def testStageName
-// Reversing list because pop() will take the last (right-most) element
-//def modeList = ['TesteNB', 'TestUE', 'TesteNB'].reverse()
-
 // Global Parameters not to break the main.py command line and code.
 def ADB_IPAddress = "none"
 def ADB_Username = "none"
@@ -201,12 +197,12 @@ pipeline {
        	    	    [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
        	    	    [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
        	    	]) {
-        	    	    sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --ADBIPAddress=${ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} ${mainPythonAllXmlFiles}"
+        	    	    sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} ${mainPythonAllXmlFiles}"
        	    	    String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
        	    	    for (xmlFile in myXmlTestSuite) {
        	    	    if (fileExists(xmlFile)) {
        	    	        try {
-        	    	            sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --eNBBranch=${eNB_Branch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UESourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBCommitID=${eNB_CommitID} --ADBIPAddress=${ADB_IPAddress} --EPCIPAddress=${EPC_IPAddress} --XMLTestFile=${xmlFile}"
+        	    	            sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --UESourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --EPCIPAddress=${EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=/tmp/${EPC_Username} --EPCType=ltebox --XMLTestFile=${xmlFile}"
        	    	        } catch (Exception e) {
        	    	            currentBuild.result = 'FAILURE'
        	    	            buildStageStatus = false
@@ -54,6 +54,10 @@ def eNB_CommitID
 def eNB_AllowMergeRequestProcess = false
 def eNB_TargetBranch

+def doEpcLogCollection = true
+
+
+
 pipeline {
    agent {
        label pythonExecutor
@@ -61,7 +65,7 @@ pipeline {
    options {
        disableConcurrentBuilds()
        ansiColor('xterm')
-        lock(extra: [[resource: ciSmartPhoneResource]], resource: ciSmartPhoneResource)
+        lock(extra: [[resource: oaiUEResource]], resource: ciSmartPhoneResource)
    }

    stages {
@@ -139,6 +143,11 @@ pipeline {

                    if (params.EPC_IPAddress == null) {
                        allParametersPresent = false
+                    } else {
+                        if (params.EPC_IPAddress == "none") {
+                            doEpcLogCollection = false
+                            echo "No EPC collections (ping/iperf/hss/mme/spgw)"
+                        }
                    }
                    if (params.EPC_Type == null) {
                        allParametersPresent = false
@@ -167,8 +176,8 @@ pipeline {
                            sh "git checkout -f ${eNB_CommitID}"
                        }
                    } else {
-                        echo "Some parameters are missing"
-                        sh "./ci-scripts/fail.sh"
+                        currentBuild.result = 'ABORTED'
+                        error('Stopping early because some parameters are missing')
                    }
                }
            }
@@ -299,6 +308,9 @@ pipeline {
                    }
                }
                stage('Log Collection (Ping)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
                    steps {
                        withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -317,6 +329,9 @@ pipeline {
                    }
                }
                stage('Log Collection (Iperf)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
                    steps {
                        withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -335,6 +350,9 @@ pipeline {
                    }
                }
                stage('Log Collection (SPGW)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
                    steps {
                        withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -353,6 +371,9 @@ pipeline {
                    }
                }
                stage('Log Collection (MME)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
                    steps {
                        withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -371,6 +392,9 @@ pipeline {
                    }
                }
                stage('Log Collection (HSS)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
                    steps {
                        withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -103,6 +103,7 @@ function build_on_vm {
    echo "############################################################"
    echo "sudo cp 01proxy /etc/apt/apt.conf.d/" > $VM_CMDS
    echo "touch /home/ubuntu/.hushlogin" >> $VM_CMDS
+    echo "git config --global https.postBuffer 123289600" >> $VM_CMDS
    if [[ "$VM_NAME" == *"-cppcheck"* ]]
    then
        if [ $DAEMON -eq 0 ]
@@ -56,6 +56,7 @@ OAI_UE_PROCESS_COULD_NOT_SYNC = -21
 OAI_UE_PROCESS_ASSERTION = -22
 OAI_UE_PROCESS_FAILED = -23
 OAI_UE_PROCESS_NO_TUNNEL_INTERFACE = -24
+OAI_UE_PROCESS_SEG_FAULT = -25
 OAI_UE_PROCESS_OK = +6

 UE_STATUS_DETACHED = 0
@@ -175,7 +176,6 @@ class SSHConnection():
 		self.UELogFile = ''
 		self.Build_OAI_UE_args = ''
 		self.Initialize_OAI_UE_args = ''
-		self.Initialize_OAI_eNB_args = ''
 		self.clean_repository = True
 		self.flexranCtrlInstalled = False
 		self.flexranCtrlStarted = False
@@ -762,13 +762,18 @@ class SSHConnection():
 		self.command('echo "ulimit -c unlimited && ./ran_build/build/' + self.air_interface + '-softmodem -O ' + lSourcePath + '/' + ci_full_config_file + extra_options + '" > ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		self.command('chmod 775 ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		self.command('echo ' + lPassWord + ' | sudo -S rm -Rf enb_' + self.testCase_id + '.log', '\$', 5)
-		self.command('echo ' + lPassWord + ' | sudo -S -E daemon --inherit --unsafe --name=enb' + str(self.eNB_instance) + '_daemon --chdir=' + lSourcePath + '/cmake_targets -o ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
+		self.command('hostnamectl','\$', 5)
+		result = re.search('CentOS Linux 7', str(self.ssh.before))
+		if result is not None:
+			self.command('echo $USER; nohup sudo ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh > ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log 2>&1 &', lUserName, 10)
+		else:
+			self.command('echo ' + lPassWord + ' | sudo -S -E daemon --inherit --unsafe --name=enb' + str(self.eNB_instance) + '_daemon --chdir=' + lSourcePath + '/cmake_targets -o ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		self.eNBLogFiles[int(self.eNB_instance)] = 'enb_' + self.testCase_id + '.log'
 		if extra_options != '':
 			self.eNBOptions[int(self.eNB_instance)] = extra_options
 		time.sleep(6)
 		doLoop = True
-		loopCounter = 10
+		loopCounter = 20
 		while (doLoop):
 			loopCounter = loopCounter - 1
 			if (loopCounter == 0):
@@ -979,18 +984,30 @@ class SSHConnection():
 					logging.debug('\u001B[1m oaitun_ue1 interface is mounted and configured\u001B[0m')
 					tunnelInterfaceStatus = True
 				else:
-					logging.error('\u001B[1m oaitun_ue1 interface is either NOT mounted or NOT configured\u001B[0m')
-					tunnelInterfaceStatus = False
+					self.command('ifconfig oaitun_ue1', '\$', 4)
+					result = re.search('inet addr', str(self.ssh.before))
+					if result is not None:
+						logging.debug('\u001B[1m oaitun_ue1 interface is mounted and configured\u001B[0m')
+						tunnelInterfaceStatus = True
+					else:
+						logging.error('\u001B[1m oaitun_ue1 interface is either NOT mounted or NOT configured\u001B[0m')
+						tunnelInterfaceStatus = False
 			else:
 				tunnelInterfaceStatus = True
+		else:
+			tunnelInterfaceStatus = True

 		self.close()
 		if fullSyncStatus and gotSyncStatus and tunnelInterfaceStatus:
 			self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'OK', ALL_PROCESSES_OK, 'OAI UE')
 			logging.debug('\u001B[1m Initialize OAI UE Completed\u001B[0m')
 		else:
-			self.htmlUEFailureMsg = 'oaitun_ue1 interface is either NOT mounted or NOT configured'
-			self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
+			if self.air_interface == 'lte':
+				self.htmlUEFailureMsg = 'oaitun_ue1 interface is either NOT mounted or NOT configured'
+				self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
+			else:
+				self.htmlUEFailureMsg = 'nr-uesoftmodem did NOT synced'
+				self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
 			logging.error('\033[91mInitialize OAI UE Failed! \033[0m')
 			self.AutoTerminateUEandeNB()

@@ -1796,7 +1813,6 @@ class SSHConnection():
 			else:
 				self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
 				self.command('cd ' + self.UESourceCodePath + '/cmake_targets/', '\$', 5)
-			self.command('cd cmake_targets', '\$', 5)
 			ping_time = re.findall("-c (\d+)",str(self.ping_args))
 			ping_status = self.command('stdbuf -o0 ping ' + self.ping_args + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '.log', '\$', int(ping_time[0])*1.5)
 			# TIMEOUT CASE
@@ -2557,7 +2573,8 @@ class SSHConnection():
 		multi_jobs = []
 		status_queue = SimpleQueue()
 		# in noS1 config, no need to check status from EPC
-		result = re.search('noS1', str(self.Initialize_eNB_args))
+		# in gNB also currently no need to check
+		result = re.search('noS1|band78', str(self.Initialize_eNB_args))
 		if result is None:
 			p = Process(target = SSH.CheckHSSProcess, args = (status_queue,))
 			p.daemon = True
@@ -3129,6 +3146,10 @@ class SSHConnection():
 				statMsg = 'UE showed ' + str(nrCRCOK) + ' PDSCH decoding message(s)'
 				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 				self.htmlUEFailureMsg += statMsg + '\n'
+			if not frequency_found:
+				statMsg = 'NR-UE could NOT synch!'
+				logging.error('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				self.htmlUEFailureMsg += statMsg + '\n'
 		if uciStatMsgCount > 0:
 			statMsg = 'UE showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
 			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
@@ -3143,20 +3164,32 @@ class SSHConnection():
 			self.htmlUEFailureMsg += statMsg + '\n'
 		if foundSegFault:
 			logging.debug('\u001B[1;37;41m UE ended with a Segmentation Fault! \u001B[0m')
-			return ENB_PROCESS_SEG_FAULT
+			if not nrUEFlag:
+				return OAI_UE_PROCESS_SEG_FAULT
+			else:
+				if not frequency_found:
+					return OAI_UE_PROCESS_SEG_FAULT
 		if foundAssertion:
 			logging.debug('\u001B[1;30;43m UE showed an assertion! \u001B[0m')
 			self.htmlUEFailureMsg += 'UE showed an assertion!\n'
-			if not mib_found or not frequency_found:
-				return OAI_UE_PROCESS_ASSERTION
+			if not nrUEFlag:
+				if not mib_found or not frequency_found:
+					return OAI_UE_PROCESS_ASSERTION
+			else:
+				if not frequency_found:
+					return OAI_UE_PROCESS_ASSERTION
 		if foundRealTimeIssue:
 			logging.debug('\u001B[1;37;41m UE faced real time issues! \u001B[0m')
 			self.htmlUEFailureMsg += 'UE faced real time issues!\n'
 			#return ENB_PROCESS_REALTIME_ISSUE
-		if no_cell_sync_found and not mib_found:
-			logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
-			self.htmlUEFailureMsg += 'UE could not synchronize!\n'
-			return OAI_UE_PROCESS_COULD_NOT_SYNC
+		if nrUEFlag:
+			if not frequency_found:
+				return OAI_UE_PROCESS_COULD_NOT_SYNC
+		else:
+			if no_cell_sync_found and not mib_found:
+				logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
+				self.htmlUEFailureMsg += 'UE could not synchronize!\n'
+				return OAI_UE_PROCESS_COULD_NOT_SYNC
 		return 0

 	def TerminateeNB(self):
@@ -3379,13 +3412,16 @@ class SSHConnection():
 				logging.debug('\u001B[1m' + ueAction + ' Failed \u001B[0m')
 				self.htmlUEFailureMsg = '<b>' + ueAction + ' Failed</b>\n' + self.htmlUEFailureMsg
 				self.CreateHtmlTestRow('N/A', 'KO', logStatus, 'UE')
-				# for NR-UE at the moment keep running 
 				if self.air_interface == 'lte':
 					# In case of sniffing on commercial eNBs we have random results
 					# Not an error then
 					if (logStatus != OAI_UE_PROCESS_COULD_NOT_SYNC) or (ueAction != 'Sniffing'):
 						self.Initialize_OAI_UE_args = ''
 						self.AutoTerminateUEandeNB()
+				else:
+					if (logStatus == OAI_UE_PROCESS_COULD_NOT_SYNC):
+						self.Initialize_OAI_UE_args = ''
+						self.AutoTerminateUEandeNB()
 			else:
 				logging.debug('\u001B[1m' + ueAction + ' Completed \u001B[0m')
 				self.htmlUEFailureMsg = '<b>' + ueAction + ' Completed</b>\n' + self.htmlUEFailureMsg
@@ -3938,7 +3974,7 @@ class SSHConnection():
 					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - eNB process not found</td>\n')
 				elif (processesStatus == OAI_UE_PROCESS_FAILED):
 					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - OAI UE process not found</td>\n')
-				elif (processesStatus == ENB_PROCESS_SEG_FAULT):
+				elif (processesStatus == ENB_PROCESS_SEG_FAULT) or (processesStatus == OAI_UE_PROCESS_SEG_FAULT):
 					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Segmentation Fault</td>\n')
 				elif (processesStatus == ENB_PROCESS_ASSERTION) or (processesStatus == OAI_UE_PROCESS_ASSERTION):
 					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Assertion</td>\n')
@@ -348,10 +348,11 @@ fi
 VM_TEMPLATE=ci-


-# look for default ASN1 release in cmake directives
+# look for ASN1 release in cmake directives
 # It will be the release used when building
-ASN1VEROPT=( `grep "add_list2_option(RRC_ASN1_VERSION" cmake_targets/CMakeLists.txt` )
-ASN1VER=${ASN1VEROPT[1]//\"}
+ASN1VEROPT=( `grep "set (RRC_ASN1_VERSION" cmake_targets/CMakeLists.txt` )
+ASN1VER=${ASN1VEROPT[2]//\"}
+ASN1VER=${ASN1VER//)}
 unset ASN1VEROPT

 # variable to identify and store the command (build, create ...)
@@ -24,6 +24,7 @@
 	<htmlTabRef>test-10-tm1</htmlTabRef>
 	<htmlTabName>Test-10MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>2</repeatCount>
 	<TestCaseRequestedList>
 030201
 040102
@@ -24,6 +24,7 @@
 	<htmlTabRef>test-20-tm1</htmlTabRef>
 	<htmlTabName>Test-20MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>4</repeatCount>
 	<TestCaseRequestedList>
 030201
 040101
@@ -21,18 +21,19 @@

 -->
 <testCaseList>
-        <htmlTabRef>run-OAI-gNB-NR-UE-USRP</htmlTabRef>
-        <htmlTabName>run OAI gNB and OAI NR UE USRP</htmlTabName>
+        <htmlTabRef>run-oai-gnb-nr-ue</htmlTabRef>
+        <htmlTabName>Run-gNB-and-NR-UE</htmlTabName>
        <htmlTabIcon>tasks</htmlTabIcon>	
+	<repeatCount>4</repeatCount>
 	<TestCaseRequestedList>
 090101 000001 090102 000002 090108 090109
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 	
        <testCase id="090101">
-                <class>Initialize_OAI_eNB</class>
+                <class>Initialize_eNB</class>
                <desc>Initialize gNB USRP</desc>
-		<Initialize_OAI_eNB_args>-O ../../../ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf</Initialize_OAI_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf</Initialize_eNB_args>
 		<air_interface>NR</air_interface>
        </testCase>

@@ -0,0 +1,44 @@
+<!--
+
+ 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
+
+-->
+<testCaseList>
+        <htmlTabRef>terminate-oai-gnb-nr-ue</htmlTabRef>
+        <htmlTabName>Terminate-gNB-and-NR-UE</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>	
+	<TestCaseRequestedList>
+090108 090109
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+	
+        <testCase id="090108">
+                <class>Terminate_OAI_UE</class>
+                <desc>Terminate NR UE</desc>
+		<air_interface>NR</air_interface>
+        </testCase>
+
+        <testCase id="090109">
+                <class>Terminate_eNB</class>
+                <desc>Terminate gNB</desc>
+		<air_interface>NR</air_interface>
+        </testCase>
+
+</testCaseList>
@@ -245,6 +245,7 @@ add_boolean_option(TEST_OMG            False "???")
 add_boolean_option(DEBUG_OMG           False "???")
 add_boolean_option(PRINT_STATS         False "This adds the possibility to see the status")
 add_boolean_option(T_TRACER            True  "Activate the T tracer, a debugging/monitoring framework" )
+add_boolean_option(ENABLE_VCD          True  "always true now, time measurements of proc calls and var displays")
 add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs")
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace")
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace")
@@ -285,34 +286,10 @@ set(protobuf_generated_dir ${OPENAIR_BIN_DIR})

 # RRC
 ######
-add_list2_option(RRC_ASN1_VERSION "Rel15" "ASN.1 version of RRC interface" "Rel8" "Rel10" "Rel14" "CBA")
+set (RRC_ASN1_VERSION "Rel15")
+make_version(LTE_RRC_VERSION 15 6 0)
+set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-15.6.0.asn1)

-if (${RRC_ASN1_VERSION} STREQUAL "Rel8")
-  make_version(LTE_RRC_VERSION 8 6 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-86.asn)
-elseif (${RRC_ASN1_VERSION} STREQUAL "CBA")
-  make_version(LTE_RRC_VERSION 10 2 0)
-  add_definitions(-DCBA)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20-lola.asn)
-elseif (${RRC_ASN1_VERSION} STREQUAL "Rel10")
-  make_version(LTE_RRC_VERSION 10 2 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20.asn)
-elseif (${RRC_ASN1_VERSION} STREQUAL "Rel11")
-  make_version(LTE_RRC_VERSION 11 18 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-11.18.0.asn1)
-elseif (${RRC_ASN1_VERSION} STREQUAL "Rel12")
-  make_version(LTE_RRC_VERSION 12 16 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-12.16.0.asn1)
-elseif (${RRC_ASN1_VERSION} STREQUAL "Rel13")
-  make_version(LTE_RRC_VERSION 13 9 1)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-13.9.1.asn1)
-elseif (${RRC_ASN1_VERSION} STREQUAL "Rel14")
-  make_version(LTE_RRC_VERSION 14 7 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-14.7.0.asn1)
-elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
-  make_version(LTE_RRC_VERSION 15 6 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-15.6.0.asn1)
-endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")
 add_definitions(-DLTE_RRC_VERSION=${LTE_RRC_VERSION})
 set (RRC_FULL_DIR ${asn1_generated_dir}/RRC_${RRC_ASN1_VERSION})

@@ -339,12 +316,9 @@ include_directories ("${RRC_FULL_DIR}")

 #NR RRC
 #######
-add_list2_option(NR_RRC_ASN1_VERSION "NR_Rel15" "ASN.1 version of NR_RRC interface")
-
-if (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
-  make_version(NR_RRC_VERSION 15 6 0)
-  set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.6.0.asn1)
-endif  (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
+set (NR_RRC_ASN1_VERSION "NR_Rel15" )
+make_version(NR_RRC_VERSION 15 6 0)
+set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.6.0.asn1)
 add_definitions(-DNR_RRC_VERSION=${NR_RRC_VERSION})
 set (NR_RRC_FULL_DIR ${asn1_generated_dir}/${NR_RRC_ASN1_VERSION})

@@ -373,34 +347,12 @@ include_directories ("${NR_RRC_FULL_DIR}")
 # Same limitation as described in RRC: unknown generated file list
 # so we generate it at cmake time
 ##############
-add_list1_option(S1AP_RELEASE R15 "S1AP ASN.1 grammar version" R8 R9 R10 R14 R15)
+set (S1AP_RELEASE R15)

 set(S1AP_DIR ${OPENAIR3_DIR}/S1AP)
-if (${S1AP_RELEASE} STREQUAL "R8")
-  make_version(S1AP_VERSION 8 10 0)
-  set(S1AP_ASN_FILES "s1ap-8.10.0.asn1")
-elseif (${S1AP_RELEASE} STREQUAL "R9")
-  make_version(S1AP_VERSION 9 10 0)
-  set(S1AP_ASN_FILES "s1ap-9.10.0.asn1")
-elseif (${S1AP_RELEASE} STREQUAL "R10")
-  make_version(S1AP_VERSION 10 9 0)
-  set(S1AP_ASN_FILES "s1ap-10.9.0.asn1")
-elseif (${S1AP_RELEASE} STREQUAL "R11")
-  make_version(S1AP_VERSION 11 8 0)
-  set(S1AP_ASN_FILES "s1ap-11.8.0.asn1")
-elseif (${S1AP_RELEASE} STREQUAL "R12")
-  make_version(S1AP_VERSION 12 7 0)
-  set(S1AP_ASN_FILES "s1ap-12.7.0.asn1")
-elseif (${S1AP_RELEASE} STREQUAL "R13")
-  make_version(S1AP_VERSION 13 6 0)
-  set(S1AP_ASN_FILES "s1ap-13.6.0.asn1")
-elseif (${S1AP_RELEASE} STREQUAL "R14")
-  make_version(S1AP_VERSION 14 9 0)
-  set(S1AP_ASN_FILES "s1ap-14.9.0.asn1")
-else (${S1AP_RELEASE} STREQUAL "R15")
-  make_version(S1AP_VERSION 15 6 0)
-  set(S1AP_ASN_FILES "s1ap-15.6.0.asn1")
-endif(${S1AP_RELEASE} STREQUAL "R8")
+make_version(S1AP_VERSION 15 6 0)
+set(S1AP_ASN_FILES "s1ap-15.6.0.asn1")
+
 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})
@@ -448,25 +400,12 @@ add_dependencies(S1AP_ENB rrc_flag s1ap_flag)
 # Same limitation as described in RRC/S1AP: unknown generated file list
 # so we generate it at cmake time
 ##############
-add_list1_option(X2AP_RELEASE R15 "X2AP ASN.1 grammar version" R8 R11 R12 R14 R15)
+set (X2AP_RELEASE R15)

 set(X2AP_DIR ${OPENAIR2_DIR}/X2AP)
-if (${X2AP_RELEASE} STREQUAL "R8")
-  make_version(X2AP_VERSION 8 9 0)
-  set(X2AP_ASN_FILES x2ap-8.9.0.asn1)
-elseif (${X2AP_RELEASE} STREQUAL "R11")
-  make_version(X2AP_VERSION 11 9 0)
-  set(X2AP_ASN_FILES x2ap-11.9.0.asn1)
-elseif (${X2AP_RELEASE} STREQUAL "R12")
-  make_version(X2AP_VERSION 12 9 0)
-  set(X2AP_ASN_FILES x2ap-12.9.0.asn1)
-elseif (${X2AP_RELEASE} STREQUAL "R14")
-  make_version(X2AP_VERSION 14 7 0)
-  set(X2AP_ASN_FILES x2ap-14.7.0.asn1)
-elseif (${X2AP_RELEASE} STREQUAL "R15")
-  make_version(X2AP_VERSION 15 6 0)
-  set(X2AP_ASN_FILES x2ap-15.6.0.asn1)
-endif(${X2AP_RELEASE} STREQUAL "R8")
+make_version(X2AP_VERSION 15 6 0)
+set(X2AP_ASN_FILES x2ap-15.6.0.asn1)
+
 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})
@@ -1033,7 +972,7 @@ set(UTIL_SRC
  ${OPENAIR2_DIR}/UTIL/LISTS/list.c
  ${OPENAIR2_DIR}/UTIL/LISTS/list2.c
  ${OPENAIR_DIR}/common/utils/LOG/log.c
-#  ${OPENAIR2_DIR}/UTIL/LOG/vcd_signal_dumper.c
+  ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
  ${OPENAIR2_DIR}/UTIL/MATH/oml.c
 #  ${OPENAIR2_DIR}/UTIL/MEM/mem_block.c
 #  ${OPENAIR2_DIR}/UTIL/OCG/OCG.c
@@ -2550,6 +2489,7 @@ add_executable(nr-uesoftmodem
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${XFORMS_SOURCE_NR}
  ${T_SOURCE}
+  ${UTIL_SRC}
  ${CONFIG_SOURCES}
  ${SHLIB_LOADER_SOURCES}
  )
@@ -2665,32 +2605,50 @@ add_executable(nr_dlschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c 
  ${OPENAIR_DIR}/common/utils/backtrace.c
  ${OPENAIR_DIR}/common/utils/system.c
+<<<<<<< HEAD
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${T_SOURCE})
  target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+=======
+  ${UTIL_SRC}
+  ${T_SOURCE})
+target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} ${ITTI_LIB} dl)
+>>>>>>> origin/develop-nr

 add_executable(nr_pbchsim  
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c 
  ${OPENAIR_DIR}/common/utils/backtrace.c
  ${OPENAIR_DIR}/common/utils/system.c
+<<<<<<< HEAD
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${T_SOURCE})
 target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)

+=======
+  ${UTIL_SRC}
+  ${T_SOURCE})
+target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} ${ITTI_LIB}  dl)
+>>>>>>> origin/develop-nr

 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim  
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c 
  ${OPENAIR_DIR}/common/utils/backtrace.c
+<<<<<<< HEAD
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+=======
+  ${OPENAIR_DIR}/common/utils/system.c
+  ${UTIL_SRC}
+>>>>>>> origin/develop-nr
  ${T_SOURCE})
-target_link_libraries(nr_pucchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+target_link_libraries(nr_pucchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} ${ITTI_LIB} dl)
 #PUCCH ---> Prashanth

 add_executable(nr_dlsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c 
  ${OPENAIR_DIR}/common/utils/backtrace.c
  ${OPENAIR_DIR}/common/utils/system.c
+<<<<<<< HEAD
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${T_SOURCE})   
 target_link_libraries(nr_dlsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON MAC_NR RRC_LIB NR_RRC_LIB CONFIG_LIB L2_NR -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
@@ -2703,20 +2661,37 @@ add_executable(nr_prachsim
  ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_common.c
  ${T_SOURCE})   
 target_link_libraries(nr_prachsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+=======
+  ${UTIL_SRC}
+  ${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} ${ITTI_LIB} dl)
+>>>>>>> origin/develop-nr

 add_executable(nr_ulschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
  ${OPENAIR_DIR}/common/utils/backtrace.c
+<<<<<<< HEAD
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${T_SOURCE})
 target_link_libraries(nr_ulschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+=======
+  ${OPENAIR_DIR}/common/utils/system.c
+  ${UTIL_SRC}
+  ${T_SOURCE})
+target_link_libraries(nr_ulschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} ${ITTI_LIB} dl)
+>>>>>>> origin/develop-nr

 add_executable(nr_ulsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
  ${OPENAIR_DIR}/common/utils/backtrace.c
+<<<<<<< HEAD
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+=======
+  ${OPENAIR_DIR}/common/utils/system.c
+  ${UTIL_SRC}
+>>>>>>> origin/develop-nr
  ${T_SOURCE})
-target_link_libraries(nr_ulsim -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)
+target_link_libraries(nr_ulsim -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} ${ITTI_LIB} dl)


 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
@@ -47,7 +47,6 @@ VCD_TIMING="False"
 DEADLINE_SCHEDULER_FLAG_USER=""
 CPU_AFFINITY_FLAG_USER="False" #Only valid when low-latency flag is set to False
 REL="Rel15"
-NR_REL="NR_Rel15"
 HW="None"
 TP="None"
 EPC=0
@@ -107,10 +106,6 @@ Options
    Makes test program for haw latency tests
 -a | --agent
   Enables agent for software-defined control of the eNB
-r | --3gpp-release
-   default is Rel14,
-   Rel8 limits the implementation to 3GPP Release 8 version
-   Rel10 limits the implementation to 3GPP Release 10 version
 -w | --hardware
   EXMIMO, USRP, BLADERF, LMSSDR, IRIS, ADRV9371_ZC706, SIMU, None (Default)
   Adds this RF board support (in external packages installation and in compilation)
@@ -236,10 +231,6 @@ function main() {
       --UE-gen-nvram)
            gen_nvram_path=$(readlink -f $2)
            shift 2;;
-       -r | --3gpp-release)
-            REL=$2
-            echo_info "Setting release to: $REL"
-            shift 2;;
       -w | --hardware)
            # Use OAI_USRP as the key word USRP is used inside UHD driver           
            case "$2" in
@@ -551,8 +542,6 @@ function main() {
 #    echo "set ( PHY_TX_THREAD $UE_EXPANSION )"                            >> $cmake_file
    echo "set ( PRE_SCD_THREAD $UE_EXPANSION )"                           >> $cmake_file
    echo "set ( UESIM_EXPANSION $UESIM_EXPANSION )"                       >> $cmake_file
-    echo "set ( RRC_ASN1_VERSION \"${REL}\")"                             >> $cmake_file
-    echo "set ( NR_RRC_ASN1_VERSION \"${NR_REL}\")"                       >> $cmake_file
    echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"                            >> $cmake_file
    echo "set ( RF_BOARD \"${HW}\")"                                      >> $cmake_file
    echo "set ( TRANSP_PRO \"${TP}\")"                                    >> $cmake_file
@@ -11,5 +11,14 @@ 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
+  if [ "$ASN1C_PREFIX" = "X2AP_" ] ; then
+    sed -i 's/18446744073709551615))/18446744073709551615U))/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReport-Item.c
+    sed -i 's/18446744073709551615 }/18446744073709551615U }/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReport-Item.c
+  fi
+  if [ "$ASN1C_PREFIX" = "S1AP_" ] ; then
+    sed -i 's/18446744073709551615))/18446744073709551615U))/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReportItem.c
+    sed -i 's/18446744073709551615 }/18446744073709551615U }/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReportItem.c
+  fi
+
 fi
-touch $done_flag
+touch $done_flag
@@ -343,6 +343,7 @@ const char* eurecomFunctionsNames[] = {
  "phy_procedures_ue_tx",
  "phy_procedures_ue_rx",
  "phy_procedures_ue_tx_ulsch_uespec",
+  "phy_procedures_nr_ue_tx_ulsch_uespec",
  "phy_procedures_ue_tx_pucch",
  "phy_procedures_ue_tx_ulsch_common",
  "phy_procedures_ue_tx_prach",
@@ -366,6 +367,11 @@ const char* eurecomFunctionsNames[] = {
  "dlsch_decoding5",
  "dlsch_decoding6",
  "dlsch_decoding7",
+  "dlsch_segmentation",
+  "dlsch_deinterleaving",
+  "dlsch_rate_matching",
+  "dlsch_ldpc",
+  "dlsch_compine_seg",
  "dlsch_pmch_decoding",
  "rx_pdcch",
  "dci_decoding",
@@ -616,6 +622,10 @@ inline static uint32_t vcd_get_write_index(void)
  return write_index;
 }

+#if defined(ENABLE_ITTI)
+int signal_mask(void);
+#endif
+
 void *vcd_dumper_thread_rt(void *args)
 {
  vcd_queue_user_data_t *data;
@@ -324,6 +324,7 @@ typedef enum {
  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX,
  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX,
  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC,
+  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_NR_UE_TX_ULSCH_UESPEC,
  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH,
  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_COMMON,
  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH,
@@ -347,6 +348,11 @@ typedef enum {
  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DECODING5,
  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DECODING6,
  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DECODING7,
+  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_SEGMENTATION,
+  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DEINTERLEAVING,
+  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_RATE_MATCHING,
+  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_LDPC,
+  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_COMBINE_SEG,
  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PMCH_DECODING,
  VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH,
  VCD_SIGNAL_DUMPER_FUNCTIONS_DCI_DECODING,
@@ -549,12 +555,20 @@ extern int ouput_vcd;

 #include "T.h"

+#define VCD_SIGNAL_DUMPER_INIT(x)         /* nothing */
+#define VCD_SIGNAL_DUMPER_CLOSE()         /* nothing */
+#define VCD_SIGNAL_DUMPER_CREATE_HEADER() /* nothing */
 #define VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(var, val) T_VCD_VARIABLE(var, val)
 #define VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(var, val) T_VCD_FUNCTION(var, val)
-#else

-#define VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(var, val)
-#define VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(var, val)
+#else /* T_TRACER */
+
+#define VCD_SIGNAL_DUMPER_INIT(aRgUmEnT)                   vcd_signal_dumper_init(aRgUmEnT)
+#define VCD_SIGNAL_DUMPER_CLOSE()                          vcd_signal_dumper_close()
+#define VCD_SIGNAL_DUMPER_CREATE_HEADER()                  vcd_signal_dumper_create_header()
+#define VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(vAr1,vAr2) vcd_signal_dumper_dump_variable_by_name(vAr1,vAr2)
+#define VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(vAr1,vAr2) vcd_signal_dumper_dump_function_by_name(vAr1,vAr2)
+
 
 #endif /* T_TRACER */

@@ -73,7 +73,7 @@ typedef struct {
 } T_cache_t;

 /* number of VCD functions (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_FUNCTIONS (231)
+#define VCD_NUM_FUNCTIONS (237)//(232)

 /* number of VCD variables (to be kept up to date! see in T_messages.txt) */
 #define VCD_NUM_VARIABLES (185)
@@ -2493,6 +2493,11 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC
    GROUP = ALL:VCD:UE:VCD_FUNCTION
    FORMAT = int,value
    VCD_NAME = phy_procedures_ue_tx_ulsch_uespec
+ID = VCD_FUNCTION_PHY_PROCEDURES_NR_UE_TX_ULSCH_UESPEC
+    DESC = VCD function PHY_PROCEDURES_NR_UE_TX_ULSCH_UESPEC
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+    VCD_NAME = phy_procedures_nr_ue_tx_ulsch_uespec
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_PUCCH
    DESC = VCD function PHY_PROCEDURES_UE_TX_PUCCH
    GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -2608,6 +2613,31 @@ ID = VCD_FUNCTION_DLSCH_DECODING7
    GROUP = ALL:VCD:ENB:VCD_FUNCTION
    FORMAT = int,value
    VCD_NAME = dlsch_decoding7
+ID = VCD_FUNCTION_DLSCH_SEGMENTATION
+    DESC = VCD function DLSCH_SEGMENTATION
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+    VCD_NAME = dlsch_segmentation
+ID = VCD_FUNCTION_DLSCH_DEINTERLEAVING
+    DESC = VCD function DLSCH_DEINTERLEAVING
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+    VCD_NAME = dlsch_deinterleaving
+ID = VCD_FUNCTION_DLSCH_RATE_MATCHING
+    DESC = VCD function DLSCH_RATE_MATCHING
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+    VCD_NAME = dlsch_rate_matching
+ID = VCD_FUNCTION_DLSCH_LDPC
+    DESC = VCD function DLSCH_LDPC
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+    VCD_NAME = dlsch_ldpc
+ID = VCD_FUNCTION_DLSCH_COMBINE_SEG
+    DESC = VCD function DLSCH_COMBINE_SEG
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+    VCD_NAME = dlsch_compine_seg
 ID = VCD_FUNCTION_DLSCH_PMCH_DECODING
    DESC = VCD function DLSCH_PMCH_DECODING
    GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -663,11 +663,7 @@ static void* gNB_thread_prach( void* param ) {
   if (wait_on_condition(&proc->mutex_prach,&proc->cond_prach,&proc->instance_cnt_prach,"gNB_prach_thread") < 0) break;

   LOG_D(PHY,"Running gNB prach procedures\n");
-   prach_procedures(gNB
-#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
-      ,0
-#endif
-      );
+   prach_procedures(gNB ,0);

   if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"gNB_prach_thread") < 0) break;
 }
@@ -682,6 +678,27 @@ static void* gNB_thread_prach( void* param ) {
 extern void init_td_thread(PHY_VARS_gNB *);
 extern void init_te_thread(PHY_VARS_gNB *);

+static void* process_stats_thread(void* param) {
+
+  PHY_VARS_gNB *gNB  = (PHY_VARS_gNB*)param;
+
+  reset_meas(&gNB->dlsch_encoding_stats);
+  reset_meas(&gNB->dlsch_scrambling_stats);
+  reset_meas(&gNB->dlsch_modulation_stats);
+
+  wait_sync("process_stats_thread");
+
+  while(!oai_exit)
+  {
+    sleep(1);
+    print_meas(&gNB->dlsch_encoding_stats, "pdsch_encoding", NULL, NULL);
+    print_meas(&gNB->dlsch_scrambling_stats, "pdsch_scrambling", NULL, NULL);
+    print_meas(&gNB->dlsch_modulation_stats, "pdsch_modulation", NULL, NULL);
+  }
+  return(NULL);
+}
+
+
 void init_gNB_proc(int inst) {
  int i=0;
  int CC_id;
@@ -693,6 +710,7 @@ void init_gNB_proc(int inst) {
 #ifndef OCP_FRAMEWORK
  LOG_I(PHY,"Initializing gNB processes instance:%d CC_id %d \n",inst,CC_id);
 #endif
+  
  proc = &gNB->proc;
  L1_proc                        = &proc->L1_proc;
  L1_proc_tx                     = &proc->L1_proc_tx;
@@ -702,7 +720,7 @@ void init_gNB_proc(int inst) {
  L1_proc_tx->instance_cnt_RUs   = 0;
  proc->instance_cnt_prach       = -1;
  proc->instance_cnt_asynch_rxtx = -1;
-  proc->CC_id                    = 0;
+  proc->CC_id                    = CC_id;
  proc->first_rx                 =1;
  proc->first_tx                 =1;
  proc->RU_mask                  =0;
@@ -727,6 +745,20 @@ void init_gNB_proc(int inst) {
    threadCreate( &L1_proc_tx->pthread, gNB_L1_thread_tx, gNB,"L1_proc_tx", -1, OAI_PRIORITY_RT);
  }
  
+  if(opp_enabled == 1) threadCreate(&proc->L1_stats_thread, process_stats_thread,(void *)gNB, "time_meas", -1, OAI_PRIORITY_RT_LOW);
+  //pthread_create( &proc->pthread_prach, attr_prach, gNB_thread_prach, gNB );
+  char name[16];
+  
+  if (gNB->single_thread_flag==0) {
+    snprintf( name, sizeof(name), "L1 %d", i );
+    pthread_setname_np( L1_proc->pthread, name );
+    snprintf( name, sizeof(name), "L1TX %d", i );
+    pthread_setname_np( L1_proc_tx->pthread, name );
+  }
+  
+  AssertFatal(proc->instance_cnt_prach == -1,"instance_cnt_prach = %d\n",proc->instance_cnt_prach);
+
+  
  //pthread_create( &proc->pthread_prach, attr_prach, gNB_thread_prach, gNB );
  char name[16];
  
@@ -846,10 +846,7 @@ static void *ru_thread_prach( void *param ) {

    /*if (ru->gNB_list[0]){
      prach_procedures(
-        ru->gNB_list[0]
-    #if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
-        ,0
-    #endif
+        ru->gNB_list[0],0
        );
    }
    else {
@@ -859,10 +856,7 @@ static void *ru_thread_prach( void *param ) {
                NULL,
                NULL,
                proc->frame_prach,
-                0
-    #if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
-          ,0
-    #endif
+                0,0
          );
    }
    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 0 ); */
@@ -1069,30 +1063,39 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
      cfg->rx_bw = 1.5e6;
    } else AssertFatal(1==0,"Unknown N_RB %d\n",N_RB);
  } else if (mu == NR_MU_1) {
-    if(N_RB == 217) {
+    if(N_RB == 273) {
      if (fp->threequarter_fs) {
-        cfg->sample_rate=92.16e6;
-        cfg->samples_per_frame = 921600;
-        cfg->tx_bw = 40e6;
-        cfg->rx_bw = 40e6;
+        AssertFatal(0 == 1,"three quarter sampling not supported for N_RB 273\n");
      } else {
        cfg->sample_rate=122.88e6;
        cfg->samples_per_frame = 1228800;
-        cfg->tx_bw = 40e6;
-        cfg->rx_bw = 40e6;
+        cfg->tx_bw = 100e6;
+        cfg->rx_bw = 100e6;
+      }
+    } else if(N_RB == 217) {
+      if (fp->threequarter_fs) {
+        cfg->sample_rate=92.16e6;
+        cfg->samples_per_frame = 921600;
+        cfg->tx_bw = 80e6;
+        cfg->rx_bw = 80e6;
+      } else {
+        cfg->sample_rate=122.88e6;
+        cfg->samples_per_frame = 1228800;
+        cfg->tx_bw = 80e6;
+        cfg->rx_bw = 80e6;
      }
    } else if(N_RB == 106) {
      if (fp->threequarter_fs) {
 	cfg->sample_rate=46.08e6;
 	cfg->samples_per_frame = 460800;
-	cfg->tx_bw = 20e6;
-	cfg->rx_bw = 20e6;
+	cfg->tx_bw = 40e6;
+	cfg->rx_bw = 40e6;
      }
      else {
 	cfg->sample_rate=61.44e6;
 	cfg->samples_per_frame = 614400;
-	cfg->tx_bw = 20e6;
-	cfg->rx_bw = 20e6;
+	cfg->tx_bw = 40e6;
+	cfg->rx_bw = 40e6;
      }
    } else {
      AssertFatal(0==1,"N_RB %d not yet supported for numerology %d\n",N_RB,mu);
@@ -1615,7 +1618,7 @@ extern void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx);
 extern void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx);
 extern void feptx_prec(RU_t *ru, int frame_tx,int tti_tx);
 extern void init_fep_thread(RU_t *ru);
-extern void init_nr_feptx_thread(RU_t *ru);
+extern void nr_init_feptx_thread(RU_t *ru);

 void init_RU_proc(RU_t *ru) {
  int i=0;
@@ -1680,7 +1683,7 @@ void init_RU_proc(RU_t *ru) {
    threadCreate( &proc->pthread_prach, ru_thread_prach, (void *)ru,"RACH", -1, OAI_PRIORITY_RT );
  }

-  if (get_nprocs()>=2) {
+  if (get_thread_worker_conf() == WORKER_ENABLE) {
    if (ru->feprx) init_fep_thread(ru);

    if (ru->feptx_ofdm) nr_init_feptx_thread(ru);
@@ -1974,8 +1977,8 @@ void set_function_spec_param(RU_t *ru) {
        ru->fh_north_out          = fh_if4p5_north_out;       // send_IF4p5 on reception
        ru->fh_south_out          = tx_rf;                    // send output to RF
        ru->fh_north_asynch_in    = fh_if4p5_north_asynch_in; // TX packets come asynchronously
-        ru->feprx                 = (get_nprocs()<=2) ? fep_full :ru_fep_full_2thread;                 // RX DFTs
-        ru->feptx_ofdm            = (get_nprocs()<=2) ? nr_feptx_ofdm : nr_feptx_ofdm_2thread;               // this is fep with idft only (no precoding in RRU)
+        ru->feprx                 = (get_thread_worker_conf() == WORKER_ENABLE) ? ru_fep_full_2thread : fep_full;                 // RX DFTs
+        ru->feptx_ofdm            = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm;               // this is fep with idft only (no precoding in RRU)
        ru->feptx_prec            = NULL;
        ru->nr_start_if           = nr_start_if;              // need to start the if interface for if4p5
        ru->ifdevice.host_type    = RRU_HOST;
@@ -1996,8 +1999,8 @@ void set_function_spec_param(RU_t *ru) {
        malloc_IF4p5_buffer(ru);
      } else if (ru->function == gNodeB_3GPP) {
        ru->do_prach             = 0;                       // no prach processing in RU
-        ru->feprx                = (get_nprocs()<=2) ? fep_full : ru_fep_full_2thread;                // RX DFTs
-        ru->feptx_ofdm           = (get_nprocs()<=2) ? nr_feptx_ofdm : nr_feptx_ofdm_2thread;              // this is fep with idft and precoding
+        ru->feprx                = (get_thread_worker_conf() == WORKER_ENABLE) ? ru_fep_full_2thread : fep_full;                // RX DFTs
+        ru->feptx_ofdm           = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm;              // this is fep with idft and precoding
        ru->feptx_prec           = NULL;              // this is fep with idft and precoding
        ru->fh_north_in          = NULL;                    // no incoming fronthaul from north
        ru->fh_north_out         = NULL;                    // no outgoing fronthaul to north
@@ -2026,13 +2029,13 @@ void set_function_spec_param(RU_t *ru) {

    case REMOTE_IF5: // the remote unit is IF5 RRU
      ru->do_prach               = 0;
-      ru->feprx                  = (get_nprocs()<=2) ? fep_full : fep_full;                   // this is frequency-shift + DFTs
-      ru->feptx_prec             = feptx_prec;          // need to do transmit Precoding + IDFTs
-      ru->feptx_ofdm             = (get_nprocs()<=2) ? nr_feptx_ofdm : nr_feptx_ofdm_2thread; // need to do transmit Precoding + IDFTs
-      ru->fh_south_in            = fh_if5_south_in;     // synchronous IF5 reception
-      ru->fh_south_out           = fh_if5_south_out;    // synchronous IF5 transmission
-      ru->fh_south_asynch_in     = NULL;                // no asynchronous UL
-      ru->start_rf               = NULL;                // no local RF
+      ru->feprx                  = fep_full;                   // this is frequency-shift + DFTs
+      ru->feptx_prec             = feptx_prec;                 // need to do transmit Precoding + IDFTs
+      ru->feptx_ofdm             = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm;                 // need to do transmit Precoding + IDFTs
+      ru->fh_south_in          = fh_if5_south_in;     // synchronous IF5 reception
+      ru->fh_south_out         = fh_if5_south_out;    // synchronous IF5 transmission
+      ru->fh_south_asynch_in   = NULL;                // no asynchronous UL
+      ru->start_rf               = NULL;                 // no local RF
      ru->stop_rf                = NULL;
      ru->nr_start_if            = nr_start_if;         // need to start if interface for IF5
      ru->ifdevice.host_type     = RAU_HOST;
@@ -63,7 +63,6 @@ unsigned short config_frames[4] = {2,9,11,13};

 #include "common/utils/LOG/log.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
-
 #include "UTIL/OPT/opt.h"

 //#include "PHY/TOOLS/time_meas.h"
@@ -513,17 +512,7 @@ static void get_options(void) {
  paramdef_t cmdline_logparams[] = CMDLINE_LOGPARAMS_DESC_NR ;
  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);

@@ -918,10 +907,8 @@ int main( int argc, char **argv )
  MSC_INIT(MSC_E_UTRAN, THREAD_MAX+TASK_MAX);
 #endif

-  if (opt_type != OPT_NONE) {
-    if (init_opt() == -1)
-      LOG_E(OPT,"failed to run OPT \n");
-  }
+init_opt();
+

 #ifdef PDCP_USE_NETLINK
  netlink_init();
@@ -1153,8 +1140,6 @@ int main( int argc, char **argv )
      RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
  }

-  if (opt_enabled == 1)
-    terminate_opt();

  logClean();
  printf("Bye.\n");
@@ -34,8 +34,6 @@
    {"K" ,                    CONFIG_HLP_ITTIL,       PARAMFLAG_NOFREE, strptr:&itti_dump_file,             defstrval:"/tmp/itti.dump",    TYPE_STRING, 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},        \
@@ -120,6 +120,7 @@ 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;
@@ -397,7 +398,7 @@ int16_t dlsch_demod_shift;

 static void get_options(void) {
  int CC_id;
-  int tddflag=0, nonbiotflag;
+  int tddflag=0, nonbiotflag, vcdflag=0;
  char *loopfile=NULL;
  int dumpframe=0;
  uint32_t online_log_messages;
@@ -407,18 +408,6 @@ static void get_options(void) {
  paramdef_t cmdline_logparams[] =CMDLINE_LOGPARAMS_DESC_NR ;
  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)) {
@@ -466,6 +455,9 @@ static void get_options(void) {
      frame_parms[CC_id]->frame_type = TDD;
  }

+  if (vcdflag > 0)
+    ouput_vcd = 1;
+
  /*if (frame_parms[0]->N_RB_DL !=0) {
      if ( frame_parms[0]->N_RB_DL < 6 ) {
       frame_parms[0]->N_RB_DL = 6;
@@ -698,9 +690,10 @@ int main( int argc, char **argv ) {
  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() == -1)
-      LOG_E(OPT,"failed to run OPT \n");
+  init_opt() ;
+
+  if (ouput_vcd) {
+    vcd_signal_dumper_init("/tmp/openair_dump_nrUE.vcd");
  }

 #ifdef PDCP_USE_NETLINK
@@ -796,5 +789,8 @@ int main( int argc, char **argv ) {
  while(true)
    sleep(3600);

+  if (ouput_vcd)
+    vcd_signal_dumper_close();
+
  return 0;
 }
@@ -74,11 +74,10 @@
    {"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},                     \
+    {"V" ,                      CONFIG_HLP_VCD,         PARAMFLAG_BOOL,         iptr:&vcdflag,                         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 **)&parallel_config,      defstrval:NULL,                 TYPE_STRING,    0},                     \
@@ -612,8 +612,8 @@ typedef struct {
  uint16_t nb_mod_symbols;
  uint8_t time_allocation_type;
  uint8_t freq_allocation_type;
-  uint8_t start_prb;
-  uint8_t n_prb;
+  uint16_t start_prb;
+  uint16_t n_prb;
  uint8_t start_symbol;
  uint8_t nb_symbols;
  uint8_t mcs_idx;
@@ -376,9 +376,11 @@ int send_mac_subframe_indications(vnf_p7_t* vnf_p7)
 		if(curr->in_sync == 1)
 		{
 			// ask for subframes in the future
-			uint16_t sfn_sf_adv = increment_sfn_sf_by(curr->sfn_sf, 2);
+			//uint16_t sfn_sf_adv = increment_sfn_sf_by(curr->sfn_sf, 2);

-			vnf_p7->_public.subframe_indication(&(vnf_p7->_public), curr->phy_id, sfn_sf_adv);
+			//vnf_p7->_public.subframe_indication(&(vnf_p7->_public), curr->phy_id, sfn_sf_adv);
+            // suggestion fix by Haruki NAOI
+			vnf_p7->_public.subframe_indication(&(vnf_p7->_public), curr->phy_id, curr->sfn_sf);
 		}

 		curr = curr->next;
@@ -118,6 +118,33 @@
    \end{tabular}
 }

+\paragraph{Version 1.0:}
+\begin{itemize}
+\item Initial version
+\end{itemize}
+
+\paragraph{Version 2.0:}
+\begin{itemize}
+\item Enhancements in message passing:
+  \begin{itemize}
+  \item LUTs replaced by smaller BG-specific parameters
+  \item Inefficient load/store replaced by circular memcpy
+  \end{itemize}
+\item Bug fixes:
+  \begin{itemize}
+  \item Fixed bug in function \texttt{llr2CnProcBuf}
+  \item Corrected input LLR dynamic range in BLER simulations
+  \end{itemize}
+\item Results:
+  \begin{itemize}
+  \item Size of LUTs reduced significantly (60MB to 200KB)
+  \item Siginifcantly enhances execution time (factor 3.5)
+  \item Improved BLER performance (all simulation results have been updated)
+  \end{itemize}
+\end{itemize}
+
+
+\newpage
 \tableofcontents

 \newpage
@@ -293,7 +320,7 @@ The implementation on a general purpose processor (GPP) has to take advantage of

    \draw (bnProcPc)       edge[connector] (bnProc);
    \draw (bnProc)         edge[connector] (bn2cnProcBuf);
-    \draw (bn2cnProcBuf)   edge[connector] (cnProc);
+    \draw (bn2cnProcBuf)   edge[connector] node[above left] {\texttt{cnProcPc}} (cnProc);
    \draw (cnProc)         edge[connector] (cn2bnProcBuf);
    \draw (cn2bnProcBuf)   edge[connector] (bnProcPc);

@@ -316,7 +343,7 @@ The implementation on a general purpose processor (GPP) has to take advantage of
  \caption{LDPC Decoder processing flow.}
 \end{figure}

-The functions involved are described in more detail in table \ref{tab:sum_func}.
+The functions involved are described in more detail in Table \ref{tab:sum_func}.

 \begin{table}[ht]
  \centering
@@ -327,6 +354,7 @@ The functions involved are described in more detail in table \ref{tab:sum_func}.
    \texttt{llr2llrProcBuf} & Copies input LLRs to LLR processing buffer \\
    \texttt{llr2CnProcBuf}  & Copies input LLRs to CN  processing buffer \\
    \texttt{cnProc}         & Performs CN signal processing \\
+    \texttt{cnProcPc}       & Performs parity check \\
    \texttt{cn2bnProcBuf}   & Copies the CN results to the BN processing buffer \\
    \texttt{bnProcPc}       & Performs BN processing for parity check and/or hard-decision \\
    \texttt{bnProc}         & Utilizes the results of \texttt{bnProcPc} to compute LLRs for CN processing \\
@@ -514,24 +542,7 @@ The sum of the LLRs is carried out in 16 bit for accuracy and is then saturated
 \subsection{Mapping to the Processing Buffers}
 \label{sec:mapp-cn-proc}

-For efficient processing with the AVX instructions, the data is required to be aligned in a certain manner. That is the reason why processing buffers have been introduced. The drawback is that the results of the processing need to copied every time to the processing buffer of the next task. However, the speed up in computation with AVX more than makes up for the time wasted in copying data. The copying is implemented using look-up tables (LUTs) which are described in table \ref{tab:sum_lut}.
-
-\begin{table}[ht]
-  \centering
-  \begin{tabular}{ll}
-    \toprule
-    \textbf{LUT} & \textbf{Description} \\
-    \midrule
-    \texttt{lut\_llr2llrProcBuf\_BGX\_ZX\_RX} & Indices for function \texttt{llr2llrProcBuf} \\
-    \texttt{lut\_llr2CnProcBuf\_BGX\_ZX\_RX}  & Indices for function \texttt{llr2CnProcBuf} \\
-    \texttt{lut\_cn2bnProcBuf\_BGX\_ZX\_RX}   & Indices for functions \texttt{cn2bnProcBuf} and \texttt{bn2cnProcBuf} \\
-    \bottomrule
-  \end{tabular}
-  \caption{Summary of the LUTs.}
-  \label{tab:sum_lut}
-\end{table}
-
-These LUTs are depending on the BG, the lifting size and the code rate. Assuming 5 rates for BG2 and 7 rates for BG1, the total number of LUTs is 617.
+For efficient processing with the AVX instructions, the data is required to be aligned in a certain manner. That is the reason why processing buffers have been introduced. The drawback is that the results of the processing need to copied every time to the processing buffer of the next task. However, the speed up in computation with AVX more than makes up for the time wasted in copying data. The copying is implemented as a circular memcpy because every edge in the BG is a circular shift of a $Z\times Z$ identity matrix. Hence, a circular mempcy consists of two regular memcpys each copying a part of the $Z$ values depending on the circular shift in the BG definition. The circular shifts are stored in \texttt{nrLDPC\_lut.h} in arrays \texttt{circShift\_BGX\_ZX\_CNGX}. In the specification there are only 8 sets of cirular shifts defined. However, the applied circular shift depends on $Z$, i.e. modulo $Z$. To avoid inefficient modulo operations in loops, we store the the circular shift values for every $Z$. Moreover, for convinience the arrays are already arranged depending on the CN group (CNG).

 \newpage
 \section{Performance Results}
@@ -542,9 +553,9 @@ In this section, the performance in terms of BLER and decoding latency of the cu
 \subsection{BLER Performance}
 \label{sec:bler-performance}

-In all simulations, we assume AWGN, QPSK modulation and 8-bit input LLRs. The results are averaged over at least $10\,000$ channel realizations.
+In all simulations, we assume AWGN, QPSK modulation and 8-bit input LLRs, i.e. $-127$ until $+127$. The DLSCH coding procedure in 38.212 is used to encode/decode the TB and an error is declared if the TB CRC check failed. Results are averaged over at least $10\,000$ channel realizations. 

-The first set of simulations in Figure \ref{fig:bler-bg2-15} compares the current LDPC decoder implementation to the reference implementation developed by Kien. This reference implementation is called \textit{LDPC Ref} and uses the min-sum algorithm with 2 layers and 16 bit for processing. Out current optimized decoder implementation is referred to as \textit{LDPC Opt}. Moreover, reference results provided by Huawei are also shown.
+The first set of simulations in Figure \ref{fig:bler-bg2-15} compares the current LDPC decoder implementation to the reference implementation developed by Kien. This reference implementation is called \textit{LDPC Ref} and uses the min-sum algorithm with 2 layers and 16 bit for processing. Our current optimized decoder implementation is referred to as \textit{LDPC OAI}. Moreover, reference results provided by Huawei are also shown.

 \begin{figure}[ht]
  \centering
@@ -563,46 +574,57 @@ The first set of simulations in Figure \ref{fig:bler-bg2-15} compares the curren
      % HUAWEI merged BG2 2017-06-15
      \addplot[black, solid] plot coordinates { (-3.91839,0.01) (-3.5567,0.0001) };

+      % 5 iterations
+      % LDPC Ref
+      \addplot[red, solid, mark=o] plot coordinates {(-1.250000,0.781300) (-1.000000,0.421000) (-0.750000,0.140400) (-0.500000,0.028900) (-0.250000,0.003300) (0.000000,0.000300) (0.250000,0.000000) (0.500000,0.000000)};
+      % LDPC OAI
+      \addplot[blue, solid, mark=square] plot coordinates {(-1.000000,0.693730) (-0.750000,0.370190) (-0.500000,0.137260) (-0.250000,0.038850) (0.000000,0.009740) (0.250000,0.002510) (0.500000,0.000730) (0.750000,0.000180) };
+      % Matlab layered min-sum with scaling factor 1
+      \addplot[green, solid, mark=triangle] plot coordinates {(-1.750000,0.709000) (-1.500000,0.360600) (-1.250000,0.105500) (-1.000000,0.015700) (-0.750000,0.001300) (-0.500000,0.000100) (-0.250000,0.000000) (0.000000,0.000000) };
+      % Matlab layered min-sum with scaling factor 0.8
+      %\addplot[green, solid, mark=triangle] plot coordinates {(-2.750000,0.982300) (-2.500000,0.882200) (-2.250000,0.573100) (-2.000000,0.214100) (-1.750000,0.041300) (-1.500000,0.003800) (-1.250000,0.000000) (-1.000000,0.000000) };
+
+      % 10 iterations
      % Kien's 2-layer 16bit code
      \addplot[red, solid, mark=o] plot coordinates { (-2.750000,0.915500) (-2.500000,0.576000) (-2.250000,0.165000) (-2.000000,0.017100) (-1.750000,0.000600) (-1.500000,0.000000) (-1.250000,0.000000) (-1.000000,0.000000)};
+      % LDPC OAI
+      \addplot[blue, solid, mark=square] plot coordinates { (-2.750000,0.997200) (-2.500000,0.955000) (-2.250000,0.710900) (-2.000000,0.270400) (-1.750000,0.042400) (-1.500000,0.002200) (-1.250000,0.000000) (-1.000000,0.000000)};
+      % Matlab layered min-sum with scaling factor 1
+      \addplot[green, solid, mark=triangle] plot coordinates {(-2.750000,0.942900) (-2.500000,0.723200) (-2.250000,0.362300) (-2.000000,0.098400) (-1.750000,0.014500) (-1.500000,0.001100) (-1.250000,0.000000) (-1.000000,0.000000) };
+      % Matlab layered min-sum with scaling factor 0.8
+      %\addplot[green, solid, mark=triangle] plot coordinates {(-3.750000,0.994300) (-3.500000,0.927200) (-3.250000,0.651100) (-3.000000,0.252000) (-2.750000,0.042500) (-2.500000,0.002700) (-2.250000,0.000000) (-2.000000,0.000000) (-1.750000,0.000000) (-1.500000,0.000000) };

-      % LDPC opt with 16bit BN processing
-      \addplot[blue, solid, mark=square] plot coordinates { (-2.750000,0.998600) (-2.500000,0.953600) (-2.250000,0.718800) (-2.000000,0.299300) (-1.750000,0.053700) (-1.500000,0.005100) (-1.250000,0.000500) (-1.000000,0.000100)};
-
-      % Matlab
-      \addplot[green, solid, mark=triangle] plot coordinates {(-2.750000,0.318200) (-2.500000,0.135900) (-2.250000,0.102000) (-2.000000,0.092300) (-1.750000,0.079200) (-1.500000,0.063100) (-1.250000,0.041400) (-1.000000,0.029600) (-0.750000,0.017500) (-0.500000,0.011800) (-0.250000,0.006100) (0.000000,0.004100) (0.250000,0.002800) (0.500000,0.000800) (0.750000,0.000300) (1.000000,0.000400) };
-
-
-%      \addplot[blue, solid, mark=triangle] plot coordinates {(-2.750000,0.997600) (-2.500000,0.961600) (-2.250000,0.815200) (-2.000000,0.628800) (-1.750000,0.586200) (-1.500000,0.572800) (-1.250000,0.507600) (-1.000000,0.376700) (-0.750000,0.262000) (-0.500000,0.157100) (-0.250000,0.087100) (0.000000,0.045400) (0.250000,0.021000) (0.500000,0.010000) (0.750000,0.004400) (1.000000,0.002600) (1.250000,0.000700) (1.500000,0.000500) (1.750000,0.000000) (2.000000,0.000000) (2.250000,0.000000) (2.500000,0.000000) (2.750000,0.000000) (3.000000,0.000000)};

      % 20 iterations
+      % Kien's 2-layer 16bit code
      \addplot[red, solid, mark=o] plot coordinates { (-2.750000,0.330300) (-2.500000,0.067800) (-2.250000,0.006000) (-2.000000,0.000100) (-1.750000,0.000000) (-1.500000,0.000000) (-1.250000,0.000000) (-1.000000,0.000000)};
-
-      \addplot[blue, solid, mark=square] plot coordinates {(-2.750000,0.341300) (-2.500000,0.065100) (-2.250000,0.004100) (-2.000000,0.000200) (-1.750000,0.000100) (-1.500000,0.000000) (-1.250000,0.000000) (-1.000000,0.000000)};
-
-      % 5 iterations
-\addplot[red, solid, mark=o] plot coordinates {(-1.250000,0.781300) (-1.000000,0.421000) (-0.750000,0.140400) (-0.500000,0.028900) (-0.250000,0.003300) (0.000000,0.000300) (0.250000,0.000000) (0.500000,0.000000)};
-\addplot[blue, solid, mark=square] plot coordinates {(-0.250000,0.705000) (0.000000,0.406200) (0.250000,0.181300) (0.500000,0.061600) (0.750000,0.015900) (1.000000,0.004900) (1.250000,0.000900) (1.500000,0.000200)};
-\addplot[green, solid, mark=triangle] plot coordinates {(-1.000000,0.778900) (-0.500000,0.226400) (0.000000,0.027400) (0.500000,0.002600) (1.000000,0.000300) };
-
-% 30 iterations
-% \addplot[blue, dashed, mark=square] plot coordinates {(-3.000000,0.623800) (-2.750000,0.224100) (-2.500000,0.031600) (-2.250000,0.001100) (-2.000000,0.000000)};
+      % LDPC OAI
+      \addplot[blue, solid, mark=square] plot coordinates  {(-2.750000,0.337900) (-2.500000,0.058300) (-2.250000,0.004000) (-2.000000,0.000200) (-1.750000,0.000000) (-1.500000,0.000000) };
+      % Matlab layered min-sum with scaling factor 1
+      %\addplot[green, solid, mark=triangle] plot coordinates {(-2.750000,0.843200) (-2.500000,0.524600) (-2.250000,0.198100) (-2.000000,0.037300) (-1.750000,0.003200) (-1.500000,0.000000) };
+      % Matlab layered min-sum with scaling factor 0.8
+      %\addplot[green, solid, mark=triangle] plot coordinates {(-3.750000,0.872300) (-3.500000,0.544600) (-3.250000,0.186400) (-3.000000,0.027500) (-2.750000,0.001900) (-2.500000,0.000000) };


-\draw (axis cs:-3.3,0.1)  node[fill=white,draw=black] (pint0) {20 iter};
-\draw (axis cs:-2.3,0.01) node[draw,black,thick,ellipse,minimum height=0.3cm] (ell0) {}; \draw[black,thick] (pint0) -- (ell0);
+      
+      % Parity check 50 iterations
+      %\addplot[blue, solid, mark=square] plot coordinates {(-2.750000,0.214600) (-2.500000,0.029200) (-2.250000,0.001500) (-2.000000,0.000100) (-1.750000,0.000000) (-1.500000,0.000000) };

-\draw (axis cs:0,0.0001)   node[fill=white,draw=black] (pint1) {10 iter};
-\draw (axis cs:-1.6,0.002) node[draw,black,thick,ellipse,minimum width=0.8cm] (ell1) {}; \draw[black,thick] (pint1) -- (ell1);
-
-\draw (axis cs:1.3,0.2)  node[fill=white,draw=black] (pint2) {5 iter};
-\draw (axis cs:0.3,0.01) node[draw,black,thick,ellipse,minimum width=2cm] (ell2) {}; \draw[black,thick] (pint2) -- (ell2);

+      \draw (axis cs:-3.3,0.1)  node[fill=white,draw=black] (pint0) {20 iter};
+      \draw (axis cs:-2.3,0.01) node[draw,black,thick,ellipse,minimum height=0.3cm] (ell0) {}; \draw[black,thick] (pint0) -- (ell0);
+      
+      \draw (axis cs:-1.2,0.0001)   node[fill=white,draw=black] (pint1) {10 iter};
+      \draw (axis cs:-1.6,0.002) node[draw,black,thick,ellipse,minimum width=0.8cm] (ell1) {}; \draw[black,thick] (pint1) -- (ell1);
+      
+      \draw (axis cs:1.3,0.2)  node[fill=white,draw=black] (pint2) {5 iter};
+      \draw (axis cs:-0.4,0.01) node[draw,black,thick,ellipse,minimum width=2cm] (ell2) {}; \draw[black,thick] (pint2) -- (ell2);
+      

      \legend{ {Huawei 2017-06-15}\\
               {LDPC Ref}\\
-               {LDPC Opt}\\
-               {MATLAB 5Glib}\\};
+               {LDPC OAI}\\
+               {MATLAB NMS SF=1}\\};

    \end{semilogyaxis}
  \end{tikzpicture}
@@ -610,12 +632,20 @@ The first set of simulations in Figure \ref{fig:bler-bg2-15} compares the curren
  \label{fig:bler-bg2-15}
 \end{figure}

-From Figure \ref{fig:bler-bg2-15} it can be observed that the reference decoder outperforms the current implementation significantly for low to medium number of iterations. The reason is the implementation of 2 layers in the reference decoder, which results in faster convergence for punctured codes and hence requires less iterations to achieve a given BLER target. Note that there is a large performance loss of nearly 6 dB at BLER $10^{-2}$ between the Huawei reference and the current optimized decoder implementation with 5 iterations.
+From Figure \ref{fig:bler-bg2-15} it can be observed that the reference decoder outperforms the current implementation significantly for low to medium number of iterations. The reason is the implementation of 2 layers in the reference decoder, which results in faster convergence for punctured codes and hence requires less iterations to achieve a given BLER target. Note that there is a large performance loss of about 4 dB at BLER $10^{-2}$ between the Huawei reference and the current optimized decoder implementation with 5 iterations.

 Moreover, there is a gap of about 1.5 dB between the results provided by Huawei and the current decoder with 20 iterations. The reason is the min-sum approximation algorithm used in both the reference decoder and the current implementation. The gap can be closed by using a tighter approximation like the min-sum with normalization or the lambda-min approach. Moreover, the gap closes for higher code rates which can be observed from Figure \ref{fig:bler-bg2-r23}. The gap is only about 0.6 dB for 50 iterations.

-Concerning the LDPC decoder provided by MATLAB, the performance appears to be rather inconsistent. For 5 iterations, the MATLAB decoder outperforms the optimized decoder most likely due to a tighter approximation used in the check node processing. However, it is inferior to the reference algorithm which suggests that the MATLAB decoder is not optimized for punctured LDPC codes, i.e. no layered processing. For 50 iterations the MATLAB LDPC decoder shows a strange behavior, the slope of the BLER curve is not as expected. This suggests that there might be some internal decoder problems with the NR base graph 2.
+The Matlab results denoted \texttt{MATLAB NMS} are obtained with the function \texttt{nrLDPCDecode} provided by the MATLAB 5G Toolbox R2019b. The following options are provided to the function: \texttt{'Termination','max','Algorithm','Normalized min-sum','ScalingFactor',1}. Furthermore, the 8-bit input LLRs are adapted to fit the dynamic range of \texttt{nrLDPCDecode} which is shown in Listing \ref{ldpc_matlab}. 

+\begin{lstlisting}[frame=single,caption={Input adaptation for MATLAB LDPC Decoder},label=ldpc_matlab]
+maxLLR = max(abs(softbits));
+rxLLRs = round((softbits/maxLLR)*127);
+// adjust range to fit tanh use in decoder code 
+softbits = rxLLRs/3.4;
+\end{lstlisting}
+
+A scaling factor (SF) of 1 has been chosen to compare the results more easily with the \textit{LDPC OAI} since the resulting check node processing is the same. However, the Matlab normelized min-sum algorithm uses layered processing and floating point operations. Thus, for the same number of iterations, the performance is significantly better than \textit{LDPC OAI}, especially for small a number of iterations.

 \begin{figure}[ht]
  \centering
@@ -628,7 +658,7 @@ Concerning the LDPC decoder provided by MATLAB, the performance appears to be ra
    \pgfplotsset{every axis/.append style={mark options=solid, mark size=2.5pt}}

    \begin{semilogyaxis}[title={}, xlabel={$\SNR$ [dB]}, ylabel={BLER},
-      grid={both}, xmin=3, xmax=5.5, xtick={3,3.5,...,5.5}, ymin=0,
+      grid={both}, xmin=3, xmax=6.5, xtick={3,3.5,...,6.5}, ymin=0,
      ymax=1,ytickten={-5,-4,-3,-2,-1,0},legend columns=1]

      % Kien's 2-layer 16bit code
@@ -638,16 +668,19 @@ Concerning the LDPC decoder provided by MATLAB, the performance appears to be ra
      \addplot[black, solid] plot coordinates { (3.28392,0.01) (3.73319,0.0001) };

      % LDPC opt with 16bit BN processing
-      \addplot[blue, solid, mark=square] plot coordinates {(4.000000,0.487500) (4.250000,0.163400) (4.500000,0.029800) (4.750000,0.002700) (5.000000,0.000100)};
+      %\addplot[blue, solid, mark=square] plot coordinates {(4.000000,0.487500) (4.250000,0.163400) (4.500000,0.029800) (4.750000,0.002700) (5.000000,0.000100)};
+      \addplot[blue, solid, mark=square] plot coordinates {(5.000000,0.439600) (5.250000,0.185800) (5.500000,0.062100) (5.750000,0.015000) (6.000000,0.003900)};
+

      %\addplot[blue, dashed, mark=triangle] plot coordinates {(4.000000,0.487500) (4.250000,0.163700) (4.500000,0.030000) (4.750000,0.002900) (5.000000,0.000100)};

-      \addplot[blue, dashed, mark=square] plot coordinates {(3.000000,0.911600) (3.250000,0.614100) (3.500000,0.230100) (3.750000,0.036900) (4.000000,0.001100) (4.250000,0.000000) (4.500000,0.000000)};
+      %\addplot[blue, dashed, mark=square] plot coordinates {(3.000000,0.911600) (3.250000,0.614100) (3.500000,0.230100) (3.750000,0.036900) (4.000000,0.001100) (4.250000,0.000000) (4.500000,0.000000)};
+      \addplot[blue, dashed, mark=square] plot coordinates {(3.000000,0.900400) (3.250000,0.600000) (3.500000,0.216400) (3.750000,0.036000) (4.000000,0.002600) (4.250000,0.000000) };      


      \legend{ {Huawei 2017-06-15}\\
-               {LDPC Opt 5 iter}\\
-               {LDPC Opt 50 iter}\\};
+               {LDPC OAI 5 iter}\\
+               {LDPC OAI 50 iter}\\};

    \end{semilogyaxis}
  \end{tikzpicture}
@@ -655,7 +688,7 @@ Concerning the LDPC decoder provided by MATLAB, the performance appears to be ra
  \label{fig:bler-bg2-r23}
 \end{figure}

-Figure \ref{fig:bler-bg1-r89} shows the performance of BG1 with largest block size of $B=8448$ and highest code rate $R=8/9$.
+In Figure \ref{fig:bler-bg2-15-2} we compare the performance of different algorithms using at most 50 iterations with early stopping if the parity check passes. The Matlab layered believe propagation (LBP) is used with unquantized input LLRs and performs the best since no approximation is done in the processing. Both NMS and offset min-sum (OMS) use a scaling factor and offset, respectively, that has been empirically found to perform best in this simulation setting. Theirs performance is very close to the BLP and OMS is slightly better than NMS. The performance of \textit{LDPC OAI} is more than 1 dB worse mainly because of the looser approximation. Moreover, the NMS algorithm with SF=1 performs worst probably because the SF is not optimized for the input LLRs. From the results in Figure \ref{fig:bler-bg2-15-2} we can conclude that the performance of the \textit{LDPC OAI} can be significantly improved by adopting an offset min-sum approximation improving the performance to within 0.3dB of the Huawei reference curve.

 \begin{figure}[ht]
  \centering
@@ -668,22 +701,73 @@ Figure \ref{fig:bler-bg1-r89} shows the performance of BG1 with largest block si
    \pgfplotsset{every axis/.append style={mark options=solid, mark size=2.5pt}}

    \begin{semilogyaxis}[title={}, xlabel={$\SNR$ [dB]}, ylabel={BLER},
-      grid={both}, xmin=6, xmax=11, xtick={6,6.5,...,11}, ymin=0,
+      grid={both}, xmin=-4, xmax=-1, xtick={-4,-3.5,...,-1}, ymin=0,
+      ymax=1,ytickten={-5,-4,-3,-2,-1,0},legend columns=1]
+
+      % HUAWEI merged BG2 2017-06-15
+      \addplot[black, solid] plot coordinates { (-3.91839,0.01) (-3.5567,0.0001) };
+
+      % Parity check 50 iterations
+      \addplot[blue, solid, mark=square] plot coordinates {(-2.750000,0.214600) (-2.500000,0.029200) (-2.250000,0.001500) (-2.000000,0.000100) (-1.750000,0.000000) (-1.500000,0.000000) };
+
+      % Matlab layered believe propagation
+      \addplot[red, solid, mark=diamond] plot coordinates {(-4.500000,0.854200) (-4.250000,0.495800) (-4.000000,0.147700) (-3.750000,0.016100) (-3.500000,0.000800) (-3.250000,0.000200) (-3.000000,0.000000) };
+      
+      % Matlab layered min-sum with scaling factor 1
+      \addplot[green, dashed, mark=triangle] plot coordinates {(-2.750000,0.830100) (-2.500000,0.497700) (-2.250000,0.165800) (-2.000000,0.024000) (-1.750000,0.001900) (-1.500000,0.000000) };
+      % Matlab layered min-sum with scaling factor 0.8
+      %\addplot[green, solid, mark=triangle] plot coordinates {(-3.750000,0.734800) (-3.500000,0.353800) (-3.250000,0.084300) (-3.000000,0.008000) (-2.750000,0.000400) };
+      \addplot[green, solid, mark=triangle] plot coordinates {(-4.500000,0.964400) (-4.250000,0.748200) (-4.000000,0.333600) (-3.750000,0.057700) (-3.500000,0.004400) (-3.250000,0.000400) };
+
+      % Matlab layered offset min-sum with offset 0.025
+      \addplot[brown, solid, mark=asterisk] plot coordinates {(-4.250000,0.688800) (-4.000000,0.253800) (-3.750000,0.035600) (-3.500000,0.002000) (-3.250000,0.000000) (-3.000000,0.000000) };
+
+      
+
+      \legend{ {Huawei 2017-06-15}\\
+               {LDPC OAI}\\
+               {MATLAB LBP}\\
+               {MATLAB NMS SF=1}\\
+               {MATLAB NMS SF=0.65}\\
+               {MATLAB OMS OS=0.025}\\};
+
+    \end{semilogyaxis}
+  \end{tikzpicture}
+  \caption{BLER vs. SNR, BG2, Rate=1/5, max iterations = 50, B=1280.}
+  \label{fig:bler-bg2-15-2}
+\end{figure}
+
+
+Figure \ref{fig:bler-bg1-r89} shows the performance of BG1 with largest block size of $B=8448$ and highest code rate $R=8/9$. From Figure \ref{fig:bler-bg1-r89} it can be observed that the performance gap is only about 0.3 dB if 50 iterations are used. However, for 5 iterations there is still a significant performance loss of about 2.3 dB at BLER $10^{-2}$.
+
+\begin{figure}[ht]
+  \centering
+  \begin{tikzpicture}
+  \tikzstyle{every pin}=[fill=white,draw=black]
+    \pgfplotsset{every axis legend/.append style={
+        cells={anchor=west}, at={(1.05,1)}, anchor=north west}}
+ %   \pgfplotsset{every axis plot/.append style={smooth}}
+    \pgfplotsset{every axis/.append style={line width=0.5pt}}
+    \pgfplotsset{every axis/.append style={mark options=solid, mark size=2.5pt}}
+
+    \begin{semilogyaxis}[title={}, xlabel={$\SNR$ [dB]}, ylabel={BLER},
+      grid={both}, xmin=6, xmax=9, xtick={6,6.5,...,9}, ymin=0,
      ymax=1,ytickten={-5,-4,-3,-2,-1,0},legend columns=1]

      % Huawei
      \addplot[black, solid] plot coordinates { (6.118717,0.01) (6.291449,0.0001) };

      % LDPC opt 5 iter
-      \addplot[blue, solid, mark=square] plot coordinates {(8.500000,0.350000) (8.750000,0.155100) (9.000000,0.062400) (9.250000,0.023000) (9.500000,0.008700) (9.750000,0.003500) (10.000000,0.000900) (10.250000,0.000300) };
+      %\addplot[blue, solid, mark=square] plot coordinates {(8.500000,0.350000) (8.750000,0.155100) (9.000000,0.062400) (9.250000,0.023000) (9.500000,0.008700) (9.750000,0.003500) (10.000000,0.000900) (10.250000,0.000300) };
+      \addplot[blue, solid, mark=square] plot coordinates {(7.500000,0.858900) (7.750000,0.449500) (8.000000,0.129700) (8.250000,0.025500) (8.500000,0.002300) (8.750000,0.000300) (9.000000,0.000000) };

      % LDPC opt 50 iter
-      \addplot[blue, dashed, mark=square] plot coordinates {(6.000000,0.705333) (6.100000,0.353367) (6.200000,0.102100) (6.300000,0.015133) (6.400000,0.000967) (6.500000,0.000000)};
-
+      %\addplot[blue, dashed, mark=square] plot coordinates {(6.000000,0.705333) (6.100000,0.353367) (6.200000,0.102100) (6.300000,0.015133) (6.400000,0.000967) (6.500000,0.000000)};
+      \addplot[blue, dashed, mark=square] plot coordinates {(6.000000,0.970000) (6.100000,0.830800) (6.200000,0.527300) (6.300000,0.216900) (6.400000,0.045500) (6.500000,0.005600) (6.600000,0.000300) (6.700000,0.000000) (6.800000,0.000000) };

      \legend{ {Huawei}\\
-               {LDPC Opt 5 iter}\\
-               {LDPC Opt 50 iter}\\};
+               {LDPC OAI 5 iter}\\
+               {LDPC OAI 50 iter}\\};

    \end{semilogyaxis}
  \end{tikzpicture}
@@ -691,8 +775,6 @@ Figure \ref{fig:bler-bg1-r89} shows the performance of BG1 with largest block si
  \label{fig:bler-bg1-r89}
 \end{figure}

-From \ref{fig:bler-bg1-r89} it can be observed that the performance gap is only about 0.2 dB if 50 iterations are used. However, for 5 iterations there is still a significant performance loss of about 3.4 dB at BLER $10^{-2}$.
-
 \newpage
 \subsection{Decoding Latency}
 \label{sec:decoding-time}
@@ -707,20 +789,30 @@ The results in Table \ref{tab:lat-bg2-r15} show the impact of the number of iter
    \toprule
    \textbf{Function} & \textbf{Time [$\mu s$] (5 it)} & \textbf{Time [$\mu s$] (10 it)} & \textbf{Time [$\mu s$] (20 it)}\\
    \midrule
-    \texttt{llr2llrProcBuf} & 1.1   & 1.1   & 1.1   \\
-    \texttt{llr2CnProcBuf}  & 12.4  & 12.0  & 12.0  \\
-    \texttt{cnProc}         & 11.7  & 22.1  & 43.5  \\
-    \texttt{bnProcPc}       & 6.6   & 12.1  & 23.8  \\
-    \texttt{bnProc}         & 4.2   & 8.1   & 16.2  \\
-    \texttt{cn2bnProcBuf}   & 61.3  & 118.3 & 234.9 \\
-    \texttt{bn2cnProcBuf}   & 38.1  & 82.5  & 172.3 \\
-    \texttt{llrRes2llrOut}  & 3.5   & 3.4   & 3.4   \\
-    \texttt{llr2bit}        & 0.2   & 0.1   & 0.1   \\
+    % \texttt{llr2llrProcBuf} & 1.1   & 1.1   & 1.1   \\
+    % \texttt{llr2CnProcBuf}  & 12.4  & 12.0  & 12.0  \\
+    % \texttt{cnProc}         & 11.7  & 22.1  & 43.5  \\
+    % \texttt{bnProcPc}       & 6.6   & 12.1  & 23.8  \\
+    % \texttt{bnProc}         & 4.2   & 8.1   & 16.2  \\
+    % \texttt{cn2bnProcBuf}   & 61.3  & 118.3 & 234.9 \\
+    % \texttt{bn2cnProcBuf}   & 38.1  & 82.5  & 172.3 \\
+    % \texttt{llrRes2llrOut}  & 3.5   & 3.4   & 3.4   \\
+    % \texttt{llr2bit}        & 0.2   & 0.1   & 0.1   \\
+    \texttt{llr2llrProcBuf} & 0.5  & 0.5  & 0.5  \\
+    \texttt{llr2CnProcBuf}  & 5.0  & 4.8  & 4.9  \\
+    \texttt{cnProc}         & 12.4 & 23.0 & 42.7 \\
+    \texttt{bnProcPc}       & 8.4  & 14.8 & 27.0 \\
+    \texttt{bnProc}         & 5.5  & 10.1 & 19.0 \\
+    \texttt{cn2bnProcBuf}   & 14.9 & 24.4 & 44.0 \\
+    \texttt{bn2cnProcBuf}   & 10.5 & 17.8 & 31.8 \\
+    \texttt{llrRes2llrOut}  & 0.3  & 0.3  & 0.3  \\
+    \texttt{llr2bit}        & 0.2  & 0.2  & 0.2  \\
    \midrule
-    \textbf{Total}          & \textbf{139.4} & \textbf{260.3} & \textbf{508.4} \\
+    % \textbf{Total}          & \textbf{139.4} & \textbf{260.3} & \textbf{508.4} \\
+    \textbf{Total}          & \textbf{58.5} & \textbf{97.1} & \textbf{172.6} \\
    \bottomrule
  \end{tabular}
-  \caption{BG2, Z=128, R=1/5, B=1280, LDPC Opt}
+  \caption{BG2, Z=128, R=1/5, B=1280, LDPC OAI}
  \label{tab:lat-bg2-r15}
 \end{table}

@@ -732,20 +824,30 @@ Table \ref{tab:lat-bg2-i5} shows the impact of the code rate on the latency for
    \toprule
    \textbf{Function} & \textbf{Time [$\mu s$] (R=1/5)} & \textbf{Time [$\mu s$] (R=1/3)} & \textbf{Time [$\mu s$] (R=2/3)}\\
    \midrule
-    \texttt{llr2llrProcBuf} & 3.2   & 2.9   & 2.6   \\
-    \texttt{llr2CnProcBuf}  & 36.5  & 25.4  & 14.8  \\
-    \texttt{cnProc}         & 33.6  & 25.2  & 13.3  \\
-    \texttt{bnProcPc}       & 17.6  & 10.2  & 4.5   \\
-    \texttt{bnProc}         & 8.5   & 5.4   & 2.5   \\
-    \texttt{cn2bnProcBuf}   & 175.3 & 110.6 & 50.7  \\
-    \texttt{bn2cnProcBuf}   & 106.6 & 71.2  & 36.1  \\
-    \texttt{llrRes2llrOut}  & 10.2  & 6.3   & 3.3   \\
-    \texttt{llr2bit}        & 0.4   & 0.2   & 0.1   \\
+    % \texttt{llr2llrProcBuf} & 3.2   & 2.9   & 2.6   \\
+    % \texttt{llr2CnProcBuf}  & 36.5  & 25.4  & 14.8  \\
+    % \texttt{cnProc}         & 33.6  & 25.2  & 13.3  \\
+    % \texttt{bnProcPc}       & 17.6  & 10.2  & 4.5   \\
+    % \texttt{bnProc}         & 8.5   & 5.4   & 2.5   \\
+    % \texttt{cn2bnProcBuf}   & 175.3 & 110.6 & 50.7  \\
+    % \texttt{bn2cnProcBuf}   & 106.6 & 71.2  & 36.1  \\
+    % \texttt{llrRes2llrOut}  & 10.2  & 6.3   & 3.3   \\
+    % \texttt{llr2bit}        & 0.4   & 0.2   & 0.1   \\
+    \texttt{llr2llrProcBuf} & 1.5  & 0.9  & 0.5  \\
+    \texttt{llr2CnProcBuf}  & 6.0  & 4.1  & 2.2  \\
+    \texttt{cnProc}         & 32.2 & 23.7 & 14.4 \\
+    \texttt{bnProcPc}       & 21.2 & 12.1 & 5.5  \\
+    \texttt{bnProc}         & 9.8  & 5.9  & 2.9  \\
+    \texttt{cn2bnProcBuf}   & 23.3 & 13.9 & 6.8  \\
+    \texttt{bn2cnProcBuf}   & 14.8 & 9.7  & 5.0  \\
+    \texttt{llrRes2llrOut}  & 0.6  & 0.4  & 0.3  \\
+    \texttt{llr2bit}        & 0.7  & 0.4  & 0.2  \\
    \midrule
-    \textbf{Total}          & \textbf{392.4} & \textbf{258.0} & \textbf{128.2} \\
+    % \textbf{Total}          & \textbf{392.4} & \textbf{258.0} & \textbf{128.2} \\
+    \textbf{Total}          & \textbf{111.0} & \textbf{71.8} & \textbf{38.5} \\
    \bottomrule
  \end{tabular}
-  \caption{BG2, Z=384, B=3840, LDPC Opt, 5 iterations}
+  \caption{BG2, Z=384, B=3840, LDPC OAI, 5 iterations}
  \label{tab:lat-bg2-i5}
 \end{table}

@@ -757,33 +859,43 @@ Table \ref{tab:lat-bg1-i5} shows the results for BG1, larges block size and diff
    \toprule
    \textbf{Function} &  \textbf{Time [$\mu s$] (R=1/3)} & \textbf{Time [$\mu s$] (R=2/3)} & \textbf{Time [$\mu s$] (R=8/9)}\\
    \midrule
-    \texttt{llr2llrProcBuf}  & 5.5   & 4.9   & 4.6  \\
-    \texttt{llr2CnProcBuf}   & 60.6  & 34.1  & 24.4 \\
-    \texttt{cnProc}          & 102.0 & 74.1  & 56.0 \\
-    \texttt{bnProcPc}        & 26.0  & 11.0  & 6.4  \\
-    \texttt{bnProc}          & 15.7  & 7.4   & 4.5  \\
-    \texttt{cn2bnProcBuf}    & 291.0 & 140.8 & 83.1 \\
-    \texttt{bn2cnProcBuf}    & 193.6 & 100.5 & 63.0 \\
-    \texttt{llrRes2llrOut}   & 13.3  & 6.9   & 5.2  \\
-    \texttt{llr2bit}         & 0.4   & 0.2   & 0.2  \\
+    % \texttt{llr2llrProcBuf}  & 5.5   & 4.9   & 4.6  \\
+    % \texttt{llr2CnProcBuf}   & 60.6  & 34.1  & 24.4 \\
+    % \texttt{cnProc}          & 102.0 & 74.1  & 56.0 \\
+    % \texttt{bnProcPc}        & 26.0  & 11.0  & 6.4  \\
+    % \texttt{bnProc}          & 15.7  & 7.4   & 4.5  \\
+    % \texttt{cn2bnProcBuf}    & 291.0 & 140.8 & 83.1 \\
+    % \texttt{bn2cnProcBuf}    & 193.6 & 100.5 & 63.0 \\
+    % \texttt{llrRes2llrOut}   & 13.3  & 6.9   & 5.2  \\
+    % \texttt{llr2bit}         & 0.4   & 0.2   & 0.2  \\
+    \texttt{llr2llrProcBuf}  & 2.1  & 1.2  & 0.9  \\
+    \texttt{llr2CnProcBuf}   & 10.6 & 5.4  & 2.9  \\
+    \texttt{cnProc}          & 89.8 & 66.3 & 50.0 \\
+    \texttt{bnProcPc}        & 28.1 & 12.4 & 7.1 \\
+    \texttt{bnProc}          & 17.1 & 8.1  & 4.8 \\
+    \texttt{cn2bnProcBuf}    & 38.7 & 17.1 & 9.3 \\
+    \texttt{bn2cnProcBuf}    & 25.6 & 12.7 & 7.2 \\
+    \texttt{llrRes2llrOut}   & 0.8  & 0.4  & 0.3 \\
+    \texttt{llr2bit}         & 0.9  & 0.4  & 0.3 \\
    \midrule
-    \textbf{Total}           & \textbf{708.9} & \textbf{380.6} & \textbf{248.1}\\
+    % \textbf{Total}           & \textbf{708.9} & \textbf{380.6} & \textbf{248.1}\\
+    \textbf{Total}           & \textbf{214.6} & \textbf{124.6} & \textbf{83.6}\\
    \bottomrule
  \end{tabular}
-  \caption{BG1, Z=384, B=8448, LDPC Opt, 5 iterations}
+  \caption{BG1, Z=384, B=8448, LDPC OAI, 5 iterations}
  \label{tab:lat-bg1-i5}
 \end{table}

 From the above results it can be observed that the data transfer between CNs and BNs takes up a significant amount of the run time. However, the performance gain due to AVX instructions in both CN and BN processing is significantly larger than the penalty incurred by the data transfers.

-\section{Parity Check and early stopping Criteria}
-It is often unnecessary to carry out the maximum number of iterations. After each iteration a parity check \eqref{eq:29} can be computed and if a valid code word is found the decoder can stop. This functionality has been implemented and the additional overhead is reasonable. The PC is carried out in the CN processing buffer and the calculation complexity itself is negligible. However, for the processing it is necessary to move the BN results to the CN buffer which takes time, the overall overhead is at most $10\%$ compared to an algorithm without early stopping criteria with the same number of iterations. The PC has to be activated via the define \texttt{NR\_LDPC\_ENABLE\_PARITY\_CHECK}.
+\section{Parity Check and Early Stopping Criteria}
+It is often unnecessary to carry out the maximum number of iterations. After each iteration a parity check (PC) \eqref{eq:29} can be computed and if a valid code word is found the decoder can stop. This functionality has been implemented and the additional overhead is reasonable. The PC is carried out in the CN processing buffer and the calculation complexity itself is negligible. However, for the processing it is necessary to move the BN results to the CN buffer which takes time, the overall overhead is at most $10\%$ compared to an algorithm without early stopping criteria with the same number of iterations. The PC has to be activated via the define \texttt{NR\_LDPC\_ENABLE\_PARITY\_CHECK}.


 \section{Conclusion}
 \label{sec:conclusion}

-The results in the previous sections show that the current optimized LDPC implementation full-fills the requirements in terms of decoding latency for low to medium number of iterations at the expanse of a significant loss in BLER performance. To improve BLER performance, it is recommended to implement a layered algorithm and a min-sum algorithm with normalization. Further improvements upon the current implementation are detailed in the next section.
+The results in the previous sections show that the current optimized LDPC implementation full-fills the requirements in terms of decoding latency for low to medium number of iterations at the expense of a loss in BLER performance. To improve BLER performance, it is recommended to implement a layered algorithm and a min-sum algorithm with normalization. Further improvements upon the current implementation are detailed in the next section.

 \newpage
 \section{Future Work}
@@ -822,12 +934,16 @@ The following improvements will reduce the decoding latency:

 \begin{itemize}
 \item Adapt to AVX512
+\item Optimization of CN processing
 \item Implement 2/3-layers for faster convergence
 \end{itemize}

 \paragraph{AVX512:}
 The computations in the CN and BN processing can be further accelerated by using AVX512 instructions. This improvement will speed-up the CN and BN processing by a approximately a factor of 2.

+\paragraph{Optimization of CN Processing:}
+It can be investigated if CN processing can be improved by computing two minima regardless of the number of BNs. Susequently, the (absolute) value fed back to the BN is one of those minima.
+
 \paragraph{Layered processing:}
 The LDPC code in NR always punctures the first 2 columns of the base graph. Hence, the decoder inserts LLRs with value 0 at their place and needs to retrieve those bits during the decoding process. Instead of computing all the parity equations and then passing the results to the BN processing, it is beneficial to first compute parity equations where at most one punctured BN is connected to that CN. If two punctured BNs are connected than according to \eqref{eq:40}, the result will be again 0. Thus in a first sub-iteration those parity equation are computed and the results are send to BN processing which calculates the results using only those rows in the PCM. In the second sub-iteration the remaining check equation are used.
 The convergence of this layered approach is much fast since the bit can be retrieved more quickly while the decoding complexity remains the same. Therefore, for a fixed number of iterations the layered algorithm will have a significantly better performance.
@@ -771,7 +771,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.

-INPUT                  = ../nrLDPC_defs.h ../nrLDPC_types.h ../nrLDPC_init.h ../nrLDPC_cnProc.h ../nrLDPC_bnProc.h ../nrLDPC_mPass.h ../nrLDPC_decoder.h ../nrLDPC_decoder.c ../nrLDPC_lut/nrLDPC_lut.h
+INPUT                  = ../nrLDPC_defs.h ../nrLDPC_types.h ../nrLDPC_init.h ../nrLDPC_cnProc.h ../nrLDPC_bnProc.h ../nrLDPC_mPass.h ../nrLDPC_decoder.h ../nrLDPC_decoder.c ../nrLDPC_lut.h

 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -22,7 +22,7 @@
 /*!\file nrLDPC_cnProc.h
 * \brief Defines the functions for check node processing
 * \author Sebastian Wagner (TCL Communications) Email: <mailto:sebastian.wagner@tcl.com>
- * \date 27-03-2018
+ * \date 30-09-2019
 * \version 1.0
 * \note
 * \warning
@@ -34,6 +34,7 @@
 /**
   \brief Performs CN processing for BG2 on the CN processing buffer and stores the results in the CN processing results buffer.
   \param p_lut Pointer to decoder LUTs
+   \param p_procBuf Pointer to processing buffers
   \param Z Lifting size
 */
 static inline void nrLDPC_cnProc_BG2(t_nrLDPC_lut* p_lut, t_nrLDPC_procBuf* p_procBuf, uint16_t Z)
@@ -22,8 +22,8 @@
 /*!\file nrLDPC_decoder.c
 * \brief Defines the LDPC decoder
 * \author Sebastian Wagner (TCL Communications) Email: <mailto:sebastian.wagner@tcl.com>
- * \date 27-03-2018
- * \version 1.0
+ * \date 30-09-2019
+ * \version 2.0
 * \note
 * \warning
 */
@@ -96,6 +96,8 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
    {
        // Use LLR processing buffer as temporary output buffer
        p_llrOut = p_procBuf->llrProcBuf;
+        // Clear llrProcBuf
+        memset(p_llrOut,0, NR_LDPC_MAX_NUM_LLR*sizeof(int8_t));
    }


@@ -116,7 +118,14 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
 #ifdef NR_LDPC_PROFILER_DETAIL
    start_meas(&p_profiler->llr2CnProcBuf);
 #endif
-    nrLDPC_llr2CnProcBuf(p_lut, p_llr, p_procBuf, numLLR, Z, BG);
+    if (BG == 1)
+    {
+        nrLDPC_llr2CnProcBuf_BG1(p_lut, p_llr, p_procBuf, Z);
+    }
+    else
+    {
+        nrLDPC_llr2CnProcBuf_BG2(p_lut, p_llr, p_procBuf, Z);
+    }
 #ifdef NR_LDPC_PROFILER_DETAIL
    stop_meas(&p_profiler->llr2CnProcBuf);
 #endif
@@ -158,7 +167,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
    }
    else
    {
-        nrLDPC_cn2bnProcBuf(p_lut, p_procBuf, Z);
+        nrLDPC_cn2bnProcBuf_BG2(p_lut, p_procBuf, Z);
    }
 #ifdef NR_LDPC_PROFILER_DETAIL
    stop_meas(&p_profiler->cn2bnProcBuf);
@@ -206,7 +215,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
    }
    else
    {
-        nrLDPC_bn2cnProcBuf(p_lut, p_procBuf, Z);
+        nrLDPC_bn2cnProcBuf_BG2(p_lut, p_procBuf, Z);
    }
 #ifdef NR_LDPC_PROFILER_DETAIL
    stop_meas(&p_profiler->bn2cnProcBuf);
@@ -257,7 +266,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
        }
        else
        {
-            nrLDPC_cn2bnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_cn2bnProcBuf_BG2(p_lut, p_procBuf, Z);
        }
 #ifdef NR_LDPC_PROFILER_DETAIL
        stop_meas(&p_profiler->cn2bnProcBuf);
@@ -302,7 +311,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
        }
        else
        {
-            nrLDPC_bn2cnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_bn2cnProcBuf_BG2(p_lut, p_procBuf, Z);
        }
 #ifdef NR_LDPC_PROFILER_DETAIL
        stop_meas(&p_profiler->bn2cnProcBuf);
@@ -329,7 +338,6 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
        stop_meas(&p_profiler->cnProcPc);
 #endif
 #endif
-
    }

    // Last iteration
@@ -368,7 +376,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
        }
        else
        {
-            nrLDPC_cn2bnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_cn2bnProcBuf_BG2(p_lut, p_procBuf, Z);
        }
 #ifdef NR_LDPC_PROFILER_DETAIL
        stop_meas(&p_profiler->cn2bnProcBuf);
@@ -416,7 +424,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
        }
        else
        {
-            nrLDPC_bn2cnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_bn2cnProcBuf_BG2(p_lut, p_procBuf, Z);
        }
 #ifdef NR_LDPC_PROFILER_DETAIL
        stop_meas(&p_profiler->bn2cnProcBuf);
@@ -444,19 +452,21 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
 #endif
    }

-
    // If maximum number of iterations reached an PC still fails increase number of iterations
    // Thus, i > numMaxIter indicates that PC has failed
+
+#ifdef NR_LDPC_ENABLE_PARITY_CHECK
    if (pcRes != 0)
    {
        i++;
    }
+#endif

    // Assign results from processing buffer to output
 #ifdef NR_LDPC_PROFILER_DETAIL
    start_meas(&p_profiler->llrRes2llrOut);
 #endif
-    nrLDPC_llrRes2llrOut(p_lut, p_llrOut, p_procBuf, numLLR);
+    nrLDPC_llrRes2llrOut(p_lut, p_llrOut, p_procBuf, Z, BG);
 #ifdef NR_LDPC_PROFILER_DETAIL
    stop_meas(&p_profiler->llrRes2llrOut);
 #endif
--- a/Show More
+++ b/Show More