diff --git a/ci-scripts/buildOnVM.sh b/ci-scripts/buildOnVM.sh
index aed449f180..ec774a00ea 100755
--- a/ci-scripts/buildOnVM.sh
+++ b/ci-scripts/buildOnVM.sh
@@ -94,15 +94,22 @@ function build_on_vm {
echo "############################################################"
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
+ acquire_vm_create_lock
uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
+ echo "Waiting for VM to be started"
+ uvt-kvm wait $VM_NAME --insecure
+
+ VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
+ echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
+ release_vm_create_lock
+ else
+ echo "Waiting for VM to be started"
+ uvt-kvm wait $VM_NAME --insecure
+
+ VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
+ echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
fi
- echo "Waiting for VM to be started"
- uvt-kvm wait $VM_NAME --insecure
-
- VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
- echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
-
echo "############################################################"
echo "Copying GIT repo into VM ($VM_NAME)"
echo "############################################################"
diff --git a/ci-scripts/createVM.sh b/ci-scripts/createVM.sh
index 192008d867..e693b07b91 100755
--- a/ci-scripts/createVM.sh
+++ b/ci-scripts/createVM.sh
@@ -49,6 +49,35 @@ function create_usage {
echo ""
}
+function acquire_vm_create_lock {
+ local FlockFile="/tmp/vmclone.lck"
+ local unlocked="0"
+ touch ${FlockFile} 2>/dev/null
+ if [[ $? -ne 0 ]]
+ then
+ echo "Cannot access lock file ${FlockFile}"
+ exit 2
+ fi
+ while [ $unlocked -eq 0 ]
+ do
+ exec 5>${FlockFile}
+ flock -nx 5
+ if [[ $? -ne 0 ]]
+ then
+ echo "Another instance of VM creation is running"
+ sleep 10
+ else
+ unlocked="1"
+ fi
+ done
+ chmod 666 ${FlockFile} 2>/dev/null
+}
+
+function release_vm_create_lock {
+ local FlockFile="/tmp/vmclone.lck"
+ rm -Rf ${FlockFile}
+}
+
function create_vm {
echo "############################################################"
echo "OAI CI VM script"
@@ -60,10 +89,12 @@ function create_vm {
echo "############################################################"
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
+ acquire_vm_create_lock
uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
echo "Waiting for VM to be started"
uvt-kvm wait $VM_NAME --insecure
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
+ release_vm_create_lock
}
diff --git a/ci-scripts/oai-ci-vm-tool b/ci-scripts/oai-ci-vm-tool
index 1375fb6194..940bcd2852 100755
--- a/ci-scripts/oai-ci-vm-tool
+++ b/ci-scripts/oai-ci-vm-tool
@@ -254,6 +254,7 @@ case $key in
LOG_PATTERN=.Rel15.txt
NB_PATTERN_FILES=8
BUILD_OPTIONS="--phy_simulators"
+ VM_MEMORY=4096
RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"
NBARGS=$[$NBARGS+256]
shift
@@ -332,6 +333,7 @@ case $key in
LOG_PATTERN=.Rel15.txt
NB_PATTERN_FILES=8
BUILD_OPTIONS="--phy_simulators"
+ VM_MEMORY=4096
RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"
NBARGS=$[$NBARGS+256]
;;
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index 527fe48edb..da6649ed05 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -441,10 +441,16 @@ function run_test_on_vm {
echo "############################################################"
echo "Creating test EPC VM ($EPC_VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
+ acquire_vm_create_lock
uvt-kvm create $EPC_VM_NAME release=xenial --unsafe-caching
+ echo "Waiting for VM to be started"
+ uvt-kvm wait $EPC_VM_NAME --insecure
+ release_vm_create_lock
+ else
+ echo "Waiting for VM to be started"
+ uvt-kvm wait $EPC_VM_NAME --insecure
fi
- uvt-kvm wait $EPC_VM_NAME --insecure
EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
echo "$EPC_VM_NAME has for IP addr = $EPC_VM_IP_ADDR"
scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index c4e2399351..af9c3edf68 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -21,7 +21,7 @@
# Author: laurent THOMAS, Lionel GAUTHIER
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
#############################################
# Base directories, compatible with legacy OAI building
@@ -169,11 +169,12 @@ endif()
set(CMAKE_C_FLAGS
"${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -fPIC ")
# add autotools definitions that were maybe used!
+set(MKVER "'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'")
set(CMAKE_C_FLAGS
- "${CMAKE_C_FLAGS} -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP -D'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'"
+ "${CMAKE_C_FLAGS} -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP -D${MKVER}"
)
set(CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 -D'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'"
+ "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 -D${MKVER}"
)
add_definitions("-DASN_DISABLE_OER_SUPPORT")
@@ -252,6 +253,7 @@ add_boolean_option(UE_TIMING_TRACE False "Activate UE timing trace")
add_boolean_option(DISABLE_LOG_X False "Deactivate all LOG_* macros")
add_boolean_option(USRP_REC_PLAY False "Enable USRP record playback mode")
add_boolean_option(UE_NAS_USE_TUN False "Enable UE NAS TUN device instead of ue_ip.ko")
+add_boolean_option(NOS1 False "Allows to run without a EPC")
add_boolean_option(BASIC_SIMULATOR False "Has to be True when building the basic simulator, False otherwise")
add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
@@ -260,17 +262,17 @@ add_boolean_option(ENABLE_ITTI True "ITTI is internal messaging, should remain e
set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
if (${ENABLE_ITTI})
add_library(ITTI
- # add .h files if depend on (this one is generated)
${OCP_ITTI}/intertask_interface.cpp
${OPENAIR_DIR}/common/utils/backtrace.c
${OPENAIR_DIR}/common/utils/memory_pools.c
)
+add_dependencies(ITTI rrc_flag)
set(ITTI_LIB ITTI)
set(GTPU_need_ITTI ${OPENAIR3_DIR}/GTPV1-U/gtpv1u_eNB.c)
endif (${ENABLE_ITTI})
#############################
-# ASN.1 grammar C code generation & dependancies
+# ASN.1 grammar C code generation & dependencies
################################
# A difficulty: asn1c generates C code of a un-predictable list of files
# so, generate the c from asn1c once at cmake run time
@@ -278,8 +280,6 @@ endif (${ENABLE_ITTI})
# (so creating new asn.1 objects instead of modifying the object attributes)
# New C code source file, cmake must be re-run (instead of re-running make only)
#############
-# set(asn1c_call "${OPENAIR_CMAKE}/tools/generate_asn1")
-# set(fix_asn1c_call "${OPENAIR_CMAKE}/tools/fix_asn1")
set(asn1_generated_dir ${OPENAIR_BIN_DIR})
set(protoc_call "${OPENAIR_CMAKE}/tools/generate_protobuf")
@@ -290,7 +290,6 @@ set(protobuf_generated_dir ${OPENAIR_BIN_DIR})
add_list2_option(RRC_ASN1_VERSION "Rel15" "ASN.1 version of RRC interface" "Rel8" "Rel10" "Rel14" "CBA")
-Message("RRC_ASN1_VERSION is ${RRC_ASN1_VERSION}")
if (${RRC_ASN1_VERSION} STREQUAL "Rel8")
make_version(RRC_VERSION 8 6 0)
@@ -320,34 +319,25 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
endif (${RRC_ASN1_VERSION} STREQUAL "Rel8")
add_definitions(-DRRC_VERSION=${RRC_VERSION})
set (RRC_FULL_DIR ${asn1_generated_dir}/RRC_${RRC_ASN1_VERSION})
-message("calling asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}")
-execute_process(COMMAND mkdir -p ${RRC_FULL_DIR}
- COMMAND env asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
+
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${RRC_FULL_DIR}" "${RRC_GRAMMAR}"
+ RESULT_VARIABLE ret)
if (NOT ${ret} STREQUAL 0)
message(FATAL_ERROR "${ret}: error")
endif (NOT ${ret} STREQUAL 0)
-
file(GLOB rrc_source ${RRC_FULL_DIR}/*.c)
-file(GLOB rrc_h ${RRC_FULL_DIR}/*.h)
-set(rrc_h ${rrc_h} ${RRC_FULL_DIR}/asn_constant.h)
-set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
-add_library(RRC_LIB ${rrc_h} ${rrc_source}
- ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
- ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)
-include_directories ("${RRC_FULL_DIR}")
-
-# add the command to generate the source code
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-add_custom_command (
- OUTPUT ${RRC_FULL_DIR}/asn_constant.h
- COMMAND mkdir -p ${RRC_FULL_DIR}
- COMMAND env asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}
+add_custom_target (
+ rrc_flag ALL
+ ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${RRC_FULL_DIR}" "${RRC_GRAMMAR}"
DEPENDS ${RRC_GRAMMAR}
)
+add_library(RRC_LIB ${rrc_source}
+ ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
+ ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)
+add_dependencies(RRC_LIB rrc_flag)
+include_directories ("${RRC_FULL_DIR}")
#NR RRC
######
@@ -361,34 +351,26 @@ endif (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
add_definitions(-DNR_RRC_VERSION=${NR_RRC_VERSION})
set (NR_RRC_FULL_DIR ${asn1_generated_dir}/${NR_RRC_ASN1_VERSION})
-message("calling ASN1C_PREFIX=NR_ asn1c -pdu=all -fcompound-names -findirect-choice -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR}")
-execute_process(COMMAND mkdir -p ${NR_RRC_FULL_DIR}
- COMMAND env "ASN1C_PREFIX=NR_" asn1c -fcompound-names -findirect-choice -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
-
-#if (NOT ${ret} STREQUAL 0)
-# message(FATAL_ERROR "${ret}: error")
-#endif (NOT ${ret} STREQUAL 0)
-
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${NR_RRC_FULL_DIR}" "${NR_RRC_GRAMMAR}" "NR_" "-findirect-choice"
+ RESULT_VARIABLE ret)
+if (NOT ${ret} STREQUAL 0)
+ message(FATAL_ERROR "${ret}: error")
+endif ()
file(GLOB nr_rrc_source ${NR_RRC_FULL_DIR}/*.c)
file(GLOB nr_rrc_h ${NR_RRC_FULL_DIR}/*.h)
-set(nr_rrc_h ${nr_rrc_h} ${NR_RRC_FULL_DIR}/NR_asn_constant.h)
-#set_source_files_properties(${nr_rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
-add_library(NR_RRC_LIB
- ${nr_rrc_h}
- ${nr_rrc_source}
- ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c)
+add_custom_target (
+ nr_rrc_flag ALL
+ ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${NR_RRC_FULL_DIR}" "${NR_RRC_GRAMMAR}" "NR_" "-findirect-choice"
+ DEPENDS ${NR_RRC_GRAMMAR}
+ )
+
+add_library(NR_RRC_LIB ${nr_rrc_h} ${nr_rrc_source}
+ ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c
+ )
+add_dependencies(NR_RRC_LIB nr_rrc_flag)
include_directories ("${NR_RRC_FULL_DIR}")
-# add the command to generate the source code
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-
-add_custom_command (OUTPUT ${NR_RRC_FULL_DIR}/NR_asn_constant.h
- COMMAND mkdir -p ${NR_RRC_FULL_DIR}
- DEPENDS ${NR_RRC_GRAMMAR}
- )
# S1AP
# Same limitation as described in RRC: unknown generated file list
@@ -425,30 +407,26 @@ endif(${S1AP_RELEASE} STREQUAL "R8")
add_definitions(-DS1AP_VERSION=${S1AP_VERSION})
set(S1AP_ASN_DIR ${S1AP_DIR}/MESSAGES/ASN1/${S1AP_RELEASE})
set(S1AP_C_DIR ${asn1_generated_dir}/S1AP_${S1AP_RELEASE})
-message("calling ASN1C_PREFIX=S1AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}")
-execute_process(COMMAND mkdir -p ${S1AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
+
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${S1AP_C_DIR}" "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "S1AP_" -fno-include-deps
+ RESULT_VARIABLE ret)
if (NOT ${ret} STREQUAL 0)
message(FATAL_ERROR "${ret}: error")
endif (NOT ${ret} STREQUAL 0)
file(GLOB S1AP_source ${S1AP_C_DIR}/*.c)
-file(GLOB s1ap_h ${S1AP_C_DIR}/*.h)
-set(s1ap_h ${s1ap_h})
-
-add_custom_command (
- OUTPUT ${S1AP_C_DIR}/S1AP_asn_constant.h
- COMMAND mkdir -p ${S1AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
- DEPENDS ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
+add_custom_target (
+ s1ap_flag ALL
+ ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${S1AP_C_DIR}" "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "S1AP_" -fno-include-deps
+ DEPENDS "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}"
)
+
add_library(S1AP_LIB
${S1AP_source}
${S1AP_DIR}/s1ap_common.c
)
+add_dependencies(S1AP_LIB rrc_flag s1ap_flag)
include_directories ("${S1AP_C_DIR}")
include_directories ("${S1AP_DIR}")
@@ -467,6 +445,7 @@ add_library(S1AP_ENB
${S1AP_DIR}/s1ap_eNB_trace.c
${S1AP_DIR}/s1ap_eNB_ue_context.c
)
+add_dependencies(S1AP_ENB rrc_flag s1ap_flag)
#X2AP
# Same limitation as described in RRC/S1AP: unknown generated file list
@@ -494,24 +473,19 @@ endif(${X2AP_RELEASE} STREQUAL "R8")
add_definitions(-DX2AP_VERSION=${X2AP_VERSION})
set(X2AP_ASN_DIR ${X2AP_DIR}/MESSAGES/ASN1/${X2AP_RELEASE})
set(X2AP_C_DIR ${asn1_generated_dir}/X2AP_${X2AP_RELEASE})
-message("calling ASN1C_PREFIX=X2AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}")
-execute_process(COMMAND mkdir -p ${X2AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=X2AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
- RESULT_VARIABLE ret
- OUTPUT_QUIET
- ERROR_QUIET)
+
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${X2AP_C_DIR}" "${X2AP_ASN_DIR}/${X2AP_ASN_FILES}" "X2AP_" -fno-include-deps
+ RESULT_VARIABLE ret)
if (NOT ${ret} STREQUAL 0)
message(FATAL_ERROR "${ret}: error")
endif (NOT ${ret} STREQUAL 0)
+
file(GLOB X2AP_source ${X2AP_C_DIR}/*.c)
-file(GLOB x2ap_h ${X2AP_C_DIR}/*.h)
-set(x2ap_h ${x2ap_h})
-
-add_custom_command (
- OUTPUT ${X2AP_C_DIR}/X2AP_asn_constant.h
- COMMAND mkdir -p ${X2AP_C_DIR}
- COMMAND env "ASN1C_PREFIX=X2AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
+add_custom_target (
+ x2_flag ALL
+ COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${X2AP_C_DIR}" "${X2AP_ASN_DIR}/${X2AP_ASN_FILES}" "X2AP_" -fno-include-deps
DEPENDS ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
)
@@ -519,6 +493,7 @@ add_library(X2AP_LIB
${X2AP_source}
${X2AP_DIR}/x2ap_common.c
)
+add_dependencies(X2AP_LIB rrc_flag x2_flag)
include_directories ("${X2AP_C_DIR}")
include_directories ("${X2AP_DIR}")
@@ -532,6 +507,7 @@ add_library(X2AP_ENB
${X2AP_DIR}/x2ap_eNB_management_procedures.c
${X2AP_DIR}/x2ap_eNB_generate_messages.c
)
+add_dependencies(X2AP_ENB rrc_flag x2_flag)
# Hardware dependant options
###################################
@@ -539,6 +515,10 @@ add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4
add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")
add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR")
+if (NOT ${RF_BOARD} STREQUAL "None")
+ add_definitions(-DMANAGED_RF=1)
+endif()
+
add_list2_option(TRANSP_PRO "None" "Transport protocol type" "None" "ETHERNET")
#NOKIA config enhancement
@@ -639,6 +619,8 @@ set(HWLIB_TCP_BRIDGE_OAI_SOURCE
add_library(tcp_bridge_oai MODULE ${HWLIB_TCP_BRIDGE_OAI_SOURCE} )
set_target_properties(tcp_bridge_oai PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+add_library(rfsimulator MODULE ${OPENAIR_TARGETS}/ARCH/rfsimulator/simulator.c)
+
##########################################################
include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
@@ -661,7 +643,6 @@ add_boolean_option(NAS_NETLINK False "useless ??? Must be True to compile nasmes
add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????")
add_boolean_option(USE_MME False "this flag is used only one time in lte-softmodem.c")
-add_list_string_option(PACKAGE_NAME "NotDefined" "As per attribute name")
add_boolean_option(MESSAGE_CHART_GENERATOR False "For generating sequence diagrams")
add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchanges in sequence diagrams")
@@ -669,11 +650,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
add_boolean_option(UE_EXPANSION False "enable UE_EXPANSION with max 256 UE")
add_boolean_option(PHY_TX_THREAD False "enable UE_EXPANSION with max 256 UE")
add_boolean_option(PRE_SCD_THREAD False "enable UE_EXPANSION with max 256 UE")
-
-########################
-# Include order
-##########################
-add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
+add_boolean_option(UESIM_EXPANSION False "enable UESIM_EXPANSION with max 256 UE")
##########################
# SCHEDULING/REAL-TIME/PERF options
@@ -776,19 +753,13 @@ include_directories("${OPENAIR_BIN_DIR}")
#include_directories("${include_dirs_all}")
# Legacy exact order
-if(ENB_MODE)
- include_directories("${OPENAIR2_DIR}/COMMON")
- include_directories("${OPENAIR2_DIR}/UTIL")
- include_directories("${OPENAIR2_DIR}/UTIL/LOG")
- include_directories("${OPENAIR3_DIR}/COMMON")
- include_directories("${OPENAIR3_DIR}/UTILS")
-else()
- include_directories("${OPENAIR3_DIR}/COMMON")
- include_directories("${OPENAIR3_DIR}/UTILS")
- include_directories("${OPENAIR2_DIR}/COMMON")
- include_directories("${OPENAIR2_DIR}/UTIL")
- include_directories("${OPENAIR2_DIR}/UTIL/LOG")
-endif()
+
+include_directories("${OPENAIR2_DIR}/COMMON")
+include_directories("${OPENAIR2_DIR}/UTIL")
+include_directories("${OPENAIR2_DIR}/UTIL/LOG")
+include_directories("${OPENAIR3_DIR}/COMMON")
+include_directories("${OPENAIR3_DIR}/UTILS")
+
include_directories("${NFAPI_DIR}/nfapi/public_inc")
include_directories("${NFAPI_DIR}/common/public_inc")
include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -927,6 +898,7 @@ add_library(FLEXRAN_AGENT
${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c
)
+add_dependencies(FLEXRAN_AGENT rrc_flag)
set(FLEXRAN_AGENT_LIB FLEXRAN_AGENT)
#include_directories(${OPENAIR2_DIR}/ENB_APP)
@@ -992,6 +964,7 @@ set(UTIL_SRC
# ${OPENAIR2_DIR}/UTIL/OTG/otg_rx.c
)
add_library(UTIL ${UTIL_SRC})
+add_dependencies(UTIL rrc_flag)
#set(OMG_SUMO_SRC
# ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
@@ -1031,7 +1004,7 @@ set(SCHED_SRC
${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
)
add_library(SCHED_LIB ${SCHED_SRC})
-
+add_dependencies(SCHED_LIB rrc_flag)
set(SCHED_NR_SRC
${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_common.c
@@ -1045,6 +1018,7 @@ set(SCHED_SRC_RU
${OPENAIR1_DIR}/SCHED/prach_procedures.c
)
add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
+add_dependencies(SCHED_RU_LIB rrc_flag)
set(SCHED_SRC_UE
${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -1054,7 +1028,7 @@ set(SCHED_SRC_UE
${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
)
add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-
+add_dependencies(SCHED_UE_LIB rrc_flag)
set(SCHED_SRC_NR_UE
${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_common.c
@@ -1116,6 +1090,7 @@ set(NFAPI_USER_SRC
${NFAPI_USER_DIR}/nfapi_vnf.c
)
add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
+add_dependencies(NFAPI_USER_LIB rrc_flag)
include_directories(${NFAPI_USER_DIR})
# Layer 1
@@ -1154,11 +1129,7 @@ set(PHY_LDPCSRC
)
add_library(coding MODULE ${PHY_TURBOSRC} )
-
set(PHY_SRC_COMMON
- # depend on code generation from asn1c
- ${RRC_FULL_DIR}/asn_constant.h
- # actual source
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
# ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
@@ -1212,7 +1183,6 @@ set(PHY_SRC_COMMON
)
set(PHY_SRC
- # actual source
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
@@ -1240,7 +1210,6 @@ set(PHY_SRC
)
set(PHY_SRC_RU
- # actual source
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
@@ -1255,7 +1224,6 @@ set(PHY_SRC_RU
)
set(PHY_SRC_UE
- # actual source
${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/sss_ue.c
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
@@ -1297,9 +1265,6 @@ set(PHY_SRC_UE
)
set(PHY_NR_SRC
- # depend on code generation from asn1c
- ${RRC_FULL_DIR}/asn_constant.h
- # actual source
${OPENAIR1_DIR}/PHY/INIT/nr_init.c
${OPENAIR1_DIR}/PHY/INIT/nr_parms.c
${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_pss.c
@@ -1330,9 +1295,6 @@ set(PHY_SRC_UE
)
set(PHY_NR_UE_SRC
- # depend on code generation from asn1c
- ${RRC_FULL_DIR}/asn_constant.h
- # actual source
${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
${OPENAIR1_DIR}/PHY/INIT/nr_parms.c
${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pss_nr.c
@@ -1390,11 +1352,15 @@ if (${COMPILATION_AVX2} STREQUAL "True")
endif ()
add_library(PHY_COMMON ${PHY_SRC_COMMON})
+add_dependencies(PHY_COMMON rrc_flag)
add_library(PHY ${PHY_SRC})
+add_dependencies(PHY rrc_flag)
add_library(PHY_UE ${PHY_SRC_UE})
+add_dependencies(PHY_UE rrc_flag)
add_library(PHY_NR ${PHY_NR_SRC})
add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
add_library(PHY_RU ${PHY_SRC_RU})
+add_dependencies(PHY_RU rrc_flag)
#Library for mex functions
#########################3
@@ -1608,7 +1574,7 @@ add_library(L2
${MAC_SRC}
${ENB_APP_SRC}
)
-
+add_dependencies(L2 rrc_flag s1ap_flag x2_flag)
add_library(MAC_NR
${MAC_NR_SRC}
)
@@ -1622,12 +1588,18 @@ add_library(L2_NR
${MAC_NR_SRC}
${GNB_APP_SRC}
)
+add_dependencies(S1AP_LIB nr_rrc_flag s1ap_flag)
add_library(L2_UE
${L2_SRC_UE}
${MAC_SRC_UE}
#${MAC_NR_SRC_UE}
)
+if (NOT ${NOS1})
+target_compile_definitions(L2_UE PUBLIC -DPDCP_USE_NETLINK)
+endif()
+
+add_dependencies(L2_UE rrc_flag s1ap_flag x2_flag)
add_library( NR_L2_UE
#${L2_SRC_UE}
@@ -1696,6 +1668,7 @@ set (GTPV1U_SRC
${GTPV1U_DIR}/gtpv1u_teid_pool.c
)
add_library(GTPV1U ${GTPV1U_SRC})
+add_dependencies(GTPV1U rrc_flag)
set(SCTP_SRC
${OPENAIR3_DIR}/SCTP/sctp_common.c
@@ -1703,8 +1676,10 @@ set(SCTP_SRC
${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c
)
add_library(SCTP_CLIENT ${SCTP_SRC})
+add_dependencies(SCTP_CLIENT rrc_flag)
add_library(UDP ${OPENAIR3_DIR}/UDP/udp_eNB_task.c)
+add_dependencies(UDP rrc_flag)
set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
@@ -1953,6 +1928,7 @@ if(NAS_UE)
${libnas_ue_esm_OBJS}
${libnas_ue_esm_sap_OBJS}
)
+ add_dependencies(LIB_NAS_UE rrc_flag)
set(NAS_UE_LIB LIB_NAS_UE)
include_directories(${NAS_SRC}UE)
@@ -2213,8 +2189,6 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
###################################################
add_executable(lte-softmodem
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-enb.c
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
@@ -2236,6 +2210,7 @@ add_executable(lte-softmodem
${CONFIG_SOURCES}
${SHLIB_LOADER_SOURCES}
)
+add_dependencies(lte-softmodem rrc_flag s1ap_flag x2_flag)
target_link_libraries (lte-softmodem
-Wl,--start-group
@@ -2252,8 +2227,6 @@ target_link_libraries (lte-softmodem ${T_LIB})
# lte-softmodem-nos1 is both eNB and UE implementation
###################################################
add_executable(lte-softmodem-nos1
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-enb.c
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
@@ -2290,8 +2263,6 @@ target_link_libraries (lte-softmodem-nos1 ${T_LIB})
#######################################
add_executable(lte-uesoftmodem
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-ue.c
${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
@@ -2313,6 +2284,10 @@ add_executable(lte-uesoftmodem
${SHLIB_LOADER_SOURCES}
)
+add_dependencies(lte-uesoftmodem rrc_flag s1ap_flag x2_flag)
+if (NOT ${NOS1})
+ target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
+endif()
target_link_libraries (lte-uesoftmodem
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
@@ -2328,8 +2303,6 @@ target_link_libraries (lte-uesoftmodem ${T_LIB})
# lte-uesoftmodem-nos1 is UE implementation
###################################################
add_executable(lte-uesoftmodem-nos1
- ${rrc_h}
- ${s1ap_h}
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-ue.c
${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
@@ -2352,6 +2325,7 @@ add_executable(lte-uesoftmodem-nos1
${SHLIB_LOADER_SOURCES}
)
+add_dependencies(lte-uesoftmodem-nos1 rrc_flag s1ap_flag x2_flag)
target_link_libraries (lte-uesoftmodem-nos1
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU ${RAL_LIB} ${ITTI_LIB}
@@ -2555,33 +2529,46 @@ target_link_libraries (dlsim_tm4
pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB}
)
-add_executable(polartest ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c)
+add_executable(polartest
+ ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c)
target_link_libraries(polartest SIMU PHY PHY_NR PHY_COMMON m ${ATLAS_LIBRARIES})
-add_executable(ldpctest ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c)
+add_executable(ldpctest
+ ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c)
target_link_libraries(ldpctest SIMU PHY PHY_NR m ${ATLAS_LIBRARIES})
-add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c ${T_SOURCE})
+add_executable(nr_dlschsim
+ ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
+ ${T_SOURCE})
target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
-add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURCE})
+add_executable(nr_pbchsim
+ ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
+ ${T_SOURCE})
target_link_libraries(nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
-add_executable(nr_dlsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c ${T_SOURCE})
+add_executable(nr_dlsim
+ ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
+ ${T_SOURCE})
target_link_libraries(nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR RRC_LIB NR_RRC_LIB CONFIG_LIB L2_NR -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
-
+
add_executable(${myExe}
${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
+ ${OPENAIR_DIR}/common/utils/backtrace.c
${XFORMS_SOURCE}
${T_SOURCE}
${CONFIG_SOURCES}
${SHLIB_LOADER_SOURCES}
)
target_link_libraries (${myExe}
-
-Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY PHY_UE PHY_RU LFDS ${ITTI_LIB} LFDS7 -Wl,--end-group
pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB} dl
)
@@ -2651,7 +2638,7 @@ if (${T_TRACER})
#all "add_executable" definitions (except tests, rb_tool, updatefw)
lte-softmodem lte-softmodem-nos1 lte-uesoftmodem lte-uesoftmodem-nos1
nr-softmodem nr-softmodem-nos1 nr-uesoftmodem nr-uesoftmodem-nos1
- dlsim_tm4 dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
+ dlsim_tm4 nr_dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
pdcchsim pucchsim prachsim syncsim ulsim
ldpctest polartest
#all "add_library" definitions
@@ -2767,7 +2754,7 @@ endfunction(make_driver name dir src)
# nashmesh module
################
list(APPEND nasmesh_src device.c common.c ioctl.c classifier.c tool.c mesh.c)
-set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK")
+set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK -D${MKVER}")
# legacy Makefile was using NAS_NETLINK flag, but other drivers the hereafter flag
# so, this cmake use OAI_NW_DRIVER_USE_NETLINK everywhere
if (OAI_NW_DRIVER_USE_NETLINK)
diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index a26191e710..2c47513c34 100644
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -1057,8 +1057,8 @@
(Test2: PBCH and synchronization, 106PBR),
(Test3: PBCH-only, 217 PRB),
(Test4: PBCH and synchronization, 217 RPB),
- (Test5: PBCH-only, 217 PRB),
- (Test6: PBCH and synchronization, 217 PRB)
+ (Test5: PBCH-only, 273 PRB),
+ (Test6: PBCH and synchronization, 273 PRB)
$OPENAIR_DIR/cmake_targets/build_oai
--phy_simulators -c
@@ -1067,16 +1067,55 @@
$OPENAIR_DIR/targets/bin/nr_pbchsim.Rel15
-s0 -S1 -n1000 -R106
-s0 -S1 -n10 -I -R106
- -s0 -S1 -n1000 -R217 -N10
- -s0 -S1 -n10 -I -R217 -N10
- -s0 -S1 -n1000 -R273 -N20
- -s0 -S1 -n10 -I -R273 -N20
- nr_pbchsim.test1 nr_pbchsim.test2
+ -s0 -S1 -n1000 -R217
+ -s0 -S1 -n10 -I -R217
+ -s0 -S1 -n1000 -R273
+ -s0 -S1 -n10 -I -R273
+ nr_pbchsim.test1 nr_pbchsim.test2 nr_pbchsim.test3 nr_pbchsim.test4 nr_pbchsim.test5 nr_pbchsim.test6
PBCH test OK
segmentation fault|assertion|exiting|fatal
3
+
+
+ execution
+ nr_dlsim Test cases. (Test1: 106 PRB),
+ (Test2: 217 PRB),
+ (Test3: 273 PRB)
+
+ $OPENAIR_DIR/cmake_targets/build_oai
+ --phy_simulators -c
+ $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
+
+ $OPENAIR_DIR/targets/bin/nr_dlsim.Rel15
+ -n100 -R106
+ -n100 -R217
+ -n100 -R273
+ nr_dlsim.test1 nr_dlsim.test2 nr_dlsim.test3
+ PDCCH test OK
+ segmentation fault|assertion|exiting|fatal
+ 3
+
+
+ execution
+ nr_dlschsim Test cases. (Test1: 106 PRB),
+ (Test2: 217 PRB),
+ (Test3: 273 PRB)
+
+ $OPENAIR_DIR/cmake_targets/build_oai
+ --phy_simulators -c
+ $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
+
+ $OPENAIR_DIR/targets/bin/nr_dlschsim.Rel15
+ -R 106 -m9 -s13 -n100
+ -R 217 -m15 -s15 -n100
+ -R 273 -m19 -s20 -n100
+ nr_dlschsim.test1 nr_dlschsim.test2 nr_dlschsim.test3
+ PDSCH test OK
+ segmentation fault|assertion|exiting|fatal
+ 3
+
execution
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 01ab01f0a7..3bbc1ccb71 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -43,10 +43,10 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
MSC_GEN=0
XFORMS="True"
UE_EXPANSION="False"
+UESIM_EXPANSION="False"
PRINT_STATS="False"
VCD_TIMING="False"
-DEADLINE_SCHEDULER_FLAG_USER="False"
-FORCE_DEADLINE_SCHEDULER_FLAG_USER=""
+DEADLINE_SCHEDULER_FLAG_USER=""
CPU_AFFINITY_FLAG_USER="False" #Only valid when lowlatecy flag is set to False
REL="Rel15"
NR_REL="NR_Rel15"
@@ -78,7 +78,7 @@ trap handle_ctrl_c INT
function print_help() {
echo_info "
This program installs OpenAirInterface Software
-You should have ubuntu 14.xx, updated, and the Linux kernel >= 3.14
+You should have ubuntu 16.xx or 18.04 updated
Options
-h
This help
@@ -116,7 +116,7 @@ Options
Rel8 limits the implementation to 3GPP Release 8 version
Rel10 limits the implementation to 3GPP Release 10 version
-w | --hardware
- EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, ADRV9371_ZC706, None (Default)
+ EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, ADRV9371_ZC706, SIMU, None (Default)
Adds this RF board support (in external packages installation and in compilation)
-t | --transport protocol
ETHERNET , None
@@ -175,6 +175,9 @@ Options
--basic-simulator
Generates a basic [1 UE + 1 eNB + no channel] simulator.
See targets/ARCH/tcp_bridge/README.tcp_bridge_oai for documentation.
+--rfsimulator
+ Generate virtual RF driver
+ to use it, set the environement variable RFSIMULATOR to \"enb\" in the eNB and to the eNB IP address in the UEs
Usage (first build):
NI/ETTUS B201 + COTS UE : ./build_oai -I --eNB -x --install-system-files -w USRP
Usage (Regular):
@@ -250,7 +253,7 @@ function main() {
-w | --hardware)
HW="$2" #"${i#*=}"
# Use OAI_USRP as the key word USRP is used inside UHD driver
- if [ "$HW" != "BLADERF" -a "$HW" != "USRP" -a "$HW" != "LMSSDR" -a "$HW" != "None" -a "$HW" != "EXMIMO" -a "$HW" != "ADRV9371_ZC706" ] ; then
+ if [ "$HW" != "BLADERF" -a "$HW" != "USRP" -a "$HW" != "LMSSDR" -a "$HW" != "None" -a "$HW" != "EXMIMO" -a "$HW" != "ADRV9371_ZC706" -a "$HW" != "SIMU" ] ; then
echo_fatal "Unknown HW type $HW will exit..."
else
if [ "$HW" == "USRP" ] ; then
@@ -265,6 +268,9 @@ function main() {
if [ "$HW" == "LMSSDR" ] ; then
HW="OAI_LMSSDR"
fi
+ if [ "$HW" == "SIMU" ] ; then
+ HW="OAI_SIMU"
+ fi
echo_info "Setting hardware to: $HW"
fi
shift 2;;
@@ -331,13 +337,13 @@ function main() {
BUILD_DOXYGEN=1
echo_info "Will build doxygen support"
shift;;
- --disable-deadline)
- FORCE_DEADLINE_SCHEDULER_FLAG_USER="False"
- echo_info "Disabling the usage of deadline scheduler"
- shift 1;;
- --enable-deadline)
- FORCE_DEADLINE_SCHEDULER_FLAG_USER="True"
- echo_info "Enabling the usage of deadline scheduler"
+ --disable-deadline)
+ DEADLINE_SCHEDULER_FLAG_USER="False"
+ echo_info "Disabling the usage of deadline scheduler"
+ shift 1;;
+ --enable-deadline)
+ DEADLINE_SCHEDULER_FLAG_USER="True"
+ echo_info "Enabling the usage of deadline scheduler"
shift 1;;
--enable-cpu-affinity)
CPU_AFFINITY_FLAG_USER="True"
@@ -400,7 +406,11 @@ function main() {
BASIC_SIMULATOR=1
echo_info "Compiling the basic simulator"
shift 1;;
- -h | --help)
+ --rfsimulator)
+ RFSIMULATOR=true
+ echo_info "Compiling the RF simulator"
+ shift 1;;
+ -h | --help)
print_help
exit 1;;
*)
@@ -441,33 +451,18 @@ function main() {
fi
fi
- echo_info "RF HW set to $HW"
- #Now we set flags to enable deadline scheduler settings
- #By default: USRP: disable,
- #By default: BLADERF: enable,
- #By default: EXMIMO: enable
- if [ "$FORCE_DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
- if [ "$HW" = "EXMIMO" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="True"
- elif [ "$HW" = "ETHERNET" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_USRP" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_ADRV9371_ZC706" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_BLADERF" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "OAI_LMSSDR" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- elif [ "$HW" = "None" ] ; then
- DEADLINE_SCHEDULER_FLAG_USER="False"
- else
- echo_error "Unknown HW type $HW. Exiting now..."
- exit
- fi
- else
- DEADLINE_SCHEDULER_FLAG_USER=$FORCE_DEADLINE_SCHEDULER_FLAG_USER
- fi
+ echo_info "RF HW set to $HW"
+ # If the user doesn't specify the Linux scheduler to use, we set a value
+ if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
+ case "$HW" in
+ "EXMIMO")
+ DEADLINE_SCHEDULER_FLAG_USER="True"
+ ;;
+ *)
+ DEADLINE_SCHEDULER_FLAG_USER="False"
+ ;;
+ esac
+ fi
#Disable CPU Affinity for deadline scheduler
if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then
diff --git a/cmake_targets/tools/make_asn1c_includes.sh b/cmake_targets/tools/make_asn1c_includes.sh
new file mode 100755
index 0000000000..bd4254c938
--- /dev/null
+++ b/cmake_targets/tools/make_asn1c_includes.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+GENERATED_FULL_DIR=$1
+shift
+ASN1_SOURCE_DIR=$1
+shift
+export ASN1C_PREFIX=$1
+shift
+options=$*
+done_flag="$GENERATED_FULL_DIR"/done
+if [ "$done_flag" -ot $ASN1_SOURCE_DIR ] ; then
+ rm -f "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.c "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.h
+ mkdir -p "$GENERATED_FULL_DIR"
+ asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example $options -D $GENERATED_FULL_DIR $ASN1_SOURCE_DIR |& egrep -v "^Copied|^Compiled" | sort -u
+fi
+touch $done_flag
diff --git a/common/utils/backtrace.h b/common/utils/backtrace.h
index 9a77767cf4..3977d0321c 100644
--- a/common/utils/backtrace.h
+++ b/common/utils/backtrace.h
@@ -23,9 +23,16 @@
#ifndef BACKTRACE_H_
#define BACKTRACE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
void display_backtrace(void);
void backtrace_handle_signal(siginfo_t *info);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* BACKTRACE_H_ */
diff --git a/maketags b/maketags
index ac8d4151d4..eb7c474a38 100755
--- a/maketags
+++ b/maketags
@@ -1,4 +1,4 @@
#!/bin/sh
echo "building ctags for openair1 and openair2 ..."
-ctags -e -R --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair2/RRC/CELLULAR/ --exclude=openair2/NAS/DRIVER/CELLULAR/ --exclude=openair2/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 openair3 targets cmake_targets common nfapi
+ctags -e -R --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair1/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 openair3 targets cmake_targets common nfapi
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
index 1747e4f71b..69b1c5c3ac 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
@@ -13,6 +13,9 @@
#define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
+#define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
+#define NFAPI_NR_MAX_NB_CORESETS 12
+#define NFAPI_NR_MAX_NB_SEARCH_SPACES 40
// Extension to the generic structures for single tlv values
typedef struct {
@@ -356,7 +359,8 @@ typedef enum {
typedef enum {
NFAPI_NR_CSET_CONFIG_MIB_SIB1=0,
- NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG
+ NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG, // implicit assumption of coreset Id other than 0
+ NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG_CSET_0
} nfapi_nr_coreset_config_type_e;
typedef enum {
@@ -364,6 +368,31 @@ typedef enum {
NFAPI_NR_CSET_ALL_CONTIGUOUS_RBS
} nfapi_nr_coreset_precoder_granularity_type_e;
+typedef enum {
+ NFAPI_NR_QCL_TYPE_A=0,
+ NFAPI_NR_QCL_TYPE_B,
+ NFAPI_NR_QCL_TYPE_C,
+ NFAPI_NR_QCL_TYPE_D
+} nfapi_nr_qcl_type_e;
+
+typedef enum {
+ NFAPI_NR_SS_PERIODICITY_SL1=1,
+ NFAPI_NR_SS_PERIODICITY_SL2=2,
+ NFAPI_NR_SS_PERIODICITY_SL4=4,
+ NFAPI_NR_SS_PERIODICITY_SL5=5,
+ NFAPI_NR_SS_PERIODICITY_SL8=8,
+ NFAPI_NR_SS_PERIODICITY_SL10=10,
+ NFAPI_NR_SS_PERIODICITY_SL16=16,
+ NFAPI_NR_SS_PERIODICITY_SL20=20,
+ NFAPI_NR_SS_PERIODICITY_SL40=40,
+ NFAPI_NR_SS_PERIODICITY_SL80=80,
+ NFAPI_NR_SS_PERIODICITY_SL160=160,
+ NFAPI_NR_SS_PERIODICITY_SL320=320,
+ NFAPI_NR_SS_PERIODICITY_SL640=640,
+ NFAPI_NR_SS_PERIODICITY_SL1280=1280,
+ NFAPI_NR_SS_PERIODICITY_SL2560=2560
+} nfapi_nr_search_space_monitoring_periodicity_e;
+
typedef enum {
NFAPI_NR_PDSCH_TIME_DOMAIN_ALLOC_TYPE_DEFAULT_A=0,
NFAPI_NR_PDSCH_TIME_DOMAIN_ALLOC_TYPE_DEFAULT_B,
@@ -496,9 +525,9 @@ typedef struct{
uint8_t css_format_2_2;
uint8_t css_format_2_3;
uint8_t uss_dci_formats;
- uint8_t srs_monitoring_periodicity;
- uint8_t slot_monitoring_periodicity;
- uint8_t slot_monitoring_offset;
+ uint16_t srs_monitoring_periodicity;
+ uint16_t slot_monitoring_periodicity;
+ uint16_t slot_monitoring_offset;
uint16_t monitoring_symbols_in_slot;
uint16_t number_of_candidates[NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS];
} nfapi_nr_search_space_t;
@@ -516,7 +545,7 @@ typedef struct {
uint8_t aggregation_level;
uint8_t n_rb;
uint8_t n_symb;
- uint8_t rb_offset;
+ int8_t rb_offset;
uint8_t cr_mapping_type;
uint8_t reg_bundle_size;
uint8_t interleaver_size;
diff --git a/openair1/PHY/CODING/TESTBENCH/polartest.c b/openair1/PHY/CODING/TESTBENCH/polartest.c
index 6d50070b86..1b46cab3c1 100644
--- a/openair1/PHY/CODING/TESTBENCH/polartest.c
+++ b/openair1/PHY/CODING/TESTBENCH/polartest.c
@@ -17,428 +17,414 @@
//#define DEBUG_CRC
int main(int argc, char *argv[]) {
+ //Initiate timing. (Results depend on CPU Frequency. Therefore, might change due to performance variances during simulation.)
+ time_stats_t timeEncoder,timeDecoder;
+ opp_enabled=1;
+ int decoder_int16=0;
+ cpu_freq_GHz = get_cpu_freq_GHz();
+ reset_meas(&timeEncoder);
+ reset_meas(&timeDecoder);
+ randominit(0);
+ crcTableInit();
+ //Default simulation values (Aim for iterations = 1000000.)
+ int itr, iterations = 1000, arguments, polarMessageType = 0; //0=PBCH, 1=DCI, -1=UCI
+ double SNRstart = -20.0, SNRstop = 0.0, SNRinc= 0.5; //dB
+ double SNR, SNR_lin;
+ int16_t nBitError = 0; // -1 = Decoding failed (All list entries have failed the CRC checks).
+ uint32_t decoderState=0, blockErrorState=0; //0 = Success, -1 = Decoding failed, 1 = Block Error.
+ uint16_t testLength = 0, coderLength = 0, blockErrorCumulative=0, bitErrorCumulative=0;
+ double timeEncoderCumulative = 0, timeDecoderCumulative = 0;
+ uint8_t aggregation_level = 8, decoderListSize = 8, pathMetricAppr = 0;
- //Initiate timing. (Results depend on CPU Frequency. Therefore, might change due to performance variances during simulation.)
- time_stats_t timeEncoder,timeDecoder;
- opp_enabled=1;
- int decoder_int16=0;
- cpu_freq_GHz = get_cpu_freq_GHz();
- reset_meas(&timeEncoder);
- reset_meas(&timeDecoder);
- randominit(0);
- crcTableInit();
+ while ((arguments = getopt (argc, argv, "s:d:f:m:i:l:a:hqg")) != -1)
+ switch (arguments) {
+ case 's':
+ SNRstart = atof(optarg);
+ break;
- //Default simulation values (Aim for iterations = 1000000.)
- int itr, iterations = 1000, arguments, polarMessageType = 0; //0=PBCH, 1=DCI, -1=UCI
- double SNRstart = -20.0, SNRstop = 0.0, SNRinc= 0.5; //dB
+ case 'd':
+ SNRinc = atof(optarg);
+ break;
- double SNR, SNR_lin;
- int16_t nBitError = 0; // -1 = Decoding failed (All list entries have failed the CRC checks).
- uint32_t decoderState=0, blockErrorState=0; //0 = Success, -1 = Decoding failed, 1 = Block Error.
- uint16_t testLength = 0, coderLength = 0, blockErrorCumulative=0, bitErrorCumulative=0;
- double timeEncoderCumulative = 0, timeDecoderCumulative = 0;
- uint8_t aggregation_level = 8, decoderListSize = 8, pathMetricAppr = 0;
+ case 'f':
+ SNRstop = atof(optarg);
+ break;
- while ((arguments = getopt (argc, argv, "s:d:f:m:i:l:a:hqg")) != -1)
- switch (arguments)
- {
- case 's':
- SNRstart = atof(optarg);
- break;
+ case 'm':
+ polarMessageType = atoi(optarg);
+ break;
- case 'd':
- SNRinc = atof(optarg);
- break;
+ case 'i':
+ iterations = atoi(optarg);
+ break;
- case 'f':
- SNRstop = atof(optarg);
- break;
+ case 'l':
+ decoderListSize = (uint8_t) atoi(optarg);
+ break;
- case 'm':
- polarMessageType = atoi(optarg);
- break;
+ case 'a':
+ pathMetricAppr = (uint8_t) atoi(optarg);
+ break;
- case 'i':
- iterations = atoi(optarg);
- break;
+ case 'q':
+ decoder_int16 = 1;
+ break;
- case 'l':
- decoderListSize = (uint8_t) atoi(optarg);
- break;
+ case 'g':
+ iterations = 1;
+ SNRstart = -6.0;
+ SNRstop = -6.0;
+ decoder_int16 = 1;
+ break;
- case 'a':
- pathMetricAppr = (uint8_t) atoi(optarg);
- break;
+ case 'h':
+ printf("./polartest -s SNRstart -d SNRinc -f SNRstop -m [0=PBCH|1=DCI|2=UCI] -i iterations -l decoderListSize -a pathMetricAppr\n");
+ exit(-1);
- case 'q':
- decoder_int16 = 1;
- break;
+ default:
+ perror("[polartest.c] Problem at argument parsing with getopt");
+ exit(-1);
+ }
- case 'g':
- iterations = 1;
- SNRstart = -6.0;
- SNRstop = -6.0;
- decoder_int16 = 1;
- break;
-
- case 'h':
- printf("./polartest -s SNRstart -d SNRinc -f SNRstop -m [0=PBCH|1=DCI|2=UCI] -i iterations -l decoderListSize -a pathMetricAppr\n");
- exit(-1);
-
- default:
- perror("[polartest.c] Problem at argument parsing with getopt");
- exit(-1);
- }
-
- if (polarMessageType == 0) { //PBCH
- testLength = 64;//NR_POLAR_PBCH_PAYLOAD_BITS;
- coderLength = NR_POLAR_PBCH_E;
- aggregation_level = NR_POLAR_PBCH_AGGREGATION_LEVEL;
- } else if (polarMessageType == 1) { //DCI
- //testLength = nr_get_dci_size(params_rel15->dci_format, params_rel15->rnti_type, &fp->initial_bwp_dl, cfg);
- testLength = 41; //20;
- coderLength = 108*8; //to be changed by aggregate level function.
- } else if (polarMessageType == -1) { //UCI
- //testLength = ;
- //coderLength = ;
- }
-
-
- //Logging
- time_t currentTime;
- time (¤tTime);
- char fileName[512], currentTimeInfo[25];
- char folderName[] = ".";
-
- /*
- folderName=getenv("HOME");
- strcat(folderName,"/Desktop/polartestResults");
- */
-
- #ifdef DEBUG_POLAR_TIMING
- sprintf(fileName,"%s/TIMING_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
- #else
- sprintf(fileName,"%s/_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
- #endif
- strftime(currentTimeInfo, 25, "_%Y-%m-%d-%H-%M-%S.csv", localtime(¤tTime));
- strcat(fileName,currentTimeInfo);
-
- //Create "~/Desktop/polartestResults" folder if it doesn't already exist.
- /*
- struct stat folder = {0};
- if (stat(folderName, &folder) == -1) mkdir(folderName, S_IRWXU | S_IRWXG | S_IRWXO);
- */
-
- FILE* logFile;
- logFile = fopen(fileName, "w");
- if (logFile==NULL) {
- fprintf(stderr,"[polartest.c] Problem creating file %s with fopen\n",fileName);
- exit(-1);
- }
+ if (polarMessageType == 0) { //PBCH
+ testLength = 64;//NR_POLAR_PBCH_PAYLOAD_BITS;
+ coderLength = NR_POLAR_PBCH_E;
+ aggregation_level = NR_POLAR_PBCH_AGGREGATION_LEVEL;
+ } else if (polarMessageType == 1) { //DCI
+ //testLength = nr_get_dci_size(params_rel15->dci_format, params_rel15->rnti_type, &fp->initial_bwp_dl, cfg);
+ testLength = 41; //20;
+ coderLength = 108*8; //to be changed by aggregate level function.
+ } else if (polarMessageType == -1) { //UCI
+ //testLength = ;
+ //coderLength = ;
+ }
+ //Logging
+ time_t currentTime;
+ time (¤tTime);
+ char fileName[512], currentTimeInfo[25];
+ char folderName[] = ".";
+ /*
+ folderName=getenv("HOME");
+ strcat(folderName,"/Desktop/polartestResults");
+ */
#ifdef DEBUG_POLAR_TIMING
- fprintf(logFile,",timeEncoderCRCByte[us],timeEncoderCRCBit[us],timeEncoderInterleaver[us],timeEncoderBitInsertion[us],timeEncoder1[us],timeEncoder2[us],timeEncoderRateMatching[us],timeEncoderByte2Bit[us]\n");
+ sprintf(fileName,"%s/TIMING_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
#else
- fprintf(logFile,",SNR,nBitError,blockErrorState,t_encoder[us],t_decoder[us]\n");
+ sprintf(fileName,"%s/_ListSize_%d_pmAppr_%d_Payload_%d_Itr_%d",folderName,decoderListSize,pathMetricAppr,testLength,iterations);
#endif
+ strftime(currentTimeInfo, 25, "_%Y-%m-%d-%H-%M-%S.csv", localtime(¤tTime));
+ strcat(fileName,currentTimeInfo);
+ //Create "~/Desktop/polartestResults" folder if it doesn't already exist.
+ /*
+ struct stat folder = {0};
+ if (stat(folderName, &folder) == -1) mkdir(folderName, S_IRWXU | S_IRWXG | S_IRWXO);
+ */
+ FILE *logFile;
+ logFile = fopen(fileName, "w");
- uint8_t testArrayLength = ceil(testLength / 32.0);
- uint8_t coderArrayLength = ceil(coderLength / 32.0);
-
- uint32_t testInput[testArrayLength]; //generate randomly
- uint32_t encoderOutput[coderArrayLength];
- uint32_t estimatedOutput[testArrayLength]; //decoder output
- memset(testInput,0,sizeof(uint32_t) * testArrayLength);
- memset(encoderOutput,0,sizeof(uint32_t) * coderArrayLength);
- memset(estimatedOutput,0,sizeof(uint32_t) * testArrayLength);
-
- uint8_t encoderOutputByte[coderLength];
- double modulatedInput[coderLength]; //channel input
- double channelOutput[coderLength]; //add noise
-
- int16_t channelOutput_int16[coderLength];
-
- t_nrPolar_paramsPtr nrPolar_params = NULL, currentPtr = NULL;
- nr_polar_init(&nrPolar_params, polarMessageType, testLength, aggregation_level);
- currentPtr = nr_polar_params(nrPolar_params, polarMessageType, testLength, aggregation_level);
-
-#ifdef DEBUG_DCI_POLAR_PARAMS
- uint32_t dci_pdu[4];
- memset(dci_pdu,0,sizeof(uint32_t)*4);
- dci_pdu[0]=0x01189400;
- printf("dci_pdu: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- dci_pdu[0], dci_pdu[1], dci_pdu[2], dci_pdu[3]);
- uint32_t encoder_output[54];
- memset(encoder_output,0,sizeof(uint32_t)*54);
- uint16_t size=41;
- uint16_t rnti=3;
- aggregation_level=8;
- nr_polar_init(&nrPolar_params, 1, size, aggregation_level);
- t_nrPolar_paramsPtr currentPtrDCI=nr_polar_params(nrPolar_params, 1, size, aggregation_level);
-
- polar_encoder_dci(dci_pdu, encoder_output, currentPtrDCI, rnti);
- for (int i=0;i<54;i++)
- printf("encoder_output: [%2d]->0x%08x \n",i, encoder_output[i]);
-
- uint8_t *encoder_outputByte = malloc(sizeof(uint8_t) * currentPtrDCI->encoderLength);
- double *channel_output = malloc (sizeof(double) * currentPtrDCI->encoderLength);
- uint32_t dci_estimation[4];
- memset(dci_estimation,0,sizeof(uint32_t)*4);
- printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
- nr_bit2byte_uint32_8_t(encoder_output, currentPtrDCI->encoderLength, encoder_outputByte);
- printf("[polartest] encoder_outputByte: ");
- for (int i = 0; i < currentPtrDCI->encoderLength; i++) printf("%d-", encoder_outputByte[i]);
- printf("\n");
- for(int i=0; iencoderLength; i++) {
- if (encoder_outputByte[i] == 0) {
- channel_output[i]=1/sqrt(2);
- }
- else {
- channel_output[i]=(-1)/sqrt(2);
- }
- }
-
- decoderState = polar_decoder_dci(channel_output,
- dci_estimation,
- currentPtrDCI,
- NR_POLAR_DECODER_LISTSIZE,
- NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
- rnti);
- printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
- free(encoder_outputByte);
- free(channel_output);
- return 0;
-#endif
-
-#ifdef DEBUG_CRC
- uint32_t crc;
- unsigned int poly24c = 0xb2b11700;
- uint32_t testInputCRC[4];
- testInputCRC[0]=0x00291880;
- //testInputCRC[0]=0x01189400;
- testInputCRC[1]=0x00000000;
- testInputCRC[2]=0x00000000;
- testInputCRC[3]=0x00000000;
-
- uint32_t testInputcrc=0x01189400;
- uint32_t testInputcrc2=0x00291880;
-
- uint8_t testInputCRC2[8];
- nr_crc_bit2bit_uint32_8_t(testInputCRC, 32, testInputCRC2);
- printf("testInputCRC2: [0]->%x \t [1]->%x \t [2]->%x \t [3]->%x\n"
- " [4]->%x \t [5]->%x \t [6]->%x \t [7]->%x\n",
- testInputCRC2[0], testInputCRC2[1], testInputCRC2[2], testInputCRC2[3],
- testInputCRC2[4], testInputCRC2[5], testInputCRC2[6], testInputCRC2[7]);
- unsigned int crc41 = crc24c(testInputCRC, 32);
- unsigned int crc65 = crc24c(testInputCRC, 56);
- printf("crc41: [0]->0x%08x\tcrc65: [0]->0x%08x\n",crc41, crc65);
- for (int i=0;i<32;i++) printf("crc41[%d]=%d\tcrc65[%d]=%d\n",i,(crc41>>i)&1,i,(crc65>>i)&1);
-
- crc = crc24c(testInputCRC, testLength)>>8;
- for (int i=0;i<24;i++) printf("[i]=%d\n",(crc>>i)&1);
- printf("crc: [0]->0x%08x\n",crc);
- //crcbit(testInputCRC, sizeof(test) - 1, poly24c));
-
- testInputCRC[testLength>>3] = ((uint8_t*)&crc)[2];
- testInputCRC[1+(testLength>>3)] = ((uint8_t*)&crc)[1];
- testInputCRC[2+(testLength>>3)] = ((uint8_t*)&crc)[0];
- printf("testInputCRC: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- testInputCRC[0], testInputCRC[1], testInputCRC[2], testInputCRC[3]);
-
-
- //uint32_t trial32 = 0xffffffff;
- uint32_t trial32 = 0xf10fffff;
- uint8_t a[4];
- //memcpy(a, &trial32, sizeof(trial32));
- *(uint32_t *)a = trial32;
- unsigned char trial[4];
- trial[0]=0xff; trial[1]=0xff; trial[2]=0x0f; trial[3]=0xf1;
- uint32_t trialcrc = crc24c(trial, 32);
- uint32_t trialcrc32 = crc24c((uint8_t *)&trial32, 32);
- //uint32_t trialcrc32 = crc24c(a, 32);
- printf("crcbit(trial = %x\n", crcbit(trial, 4, poly24c));
- printf("trialcrc = %x\n", trialcrc);
- printf("trialcrc32 = %x\n", trialcrc32);
- for (int i=0;i<32;i++) printf("trialcrc[%2d]=%d\ttrialcrc32[%2d]=%d\n",i,(trialcrc>>i)&1,i,(trialcrc32>>i)&1);
-
-
- //uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
- uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,1};
- uint8_t nr_polar_crc[24];
- uint8_t **crc_generator_matrix = crc24c_generator_matrix(32);
- nr_matrix_multiplication_uint8_1D_uint8_2D(nr_polar_A,
- crc_generator_matrix,
- nr_polar_crc,
- 32,
- 24);
- for (uint8_t i = 0; i < 24; i++){
- nr_polar_crc[i] = (nr_polar_crc[i] % 2);
- printf("nr_polar_crc[%d]=%d\n",i,nr_polar_crc[i]);
- }
- return 0;
-#endif
+ if (logFile==NULL) {
+ fprintf(stderr,"[polartest.c] Problem creating file %s with fopen\n",fileName);
+ exit(-1);
+ }
#ifdef DEBUG_POLAR_TIMING
- for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
- SNR_lin = pow(10, SNR / 10);
- for (itr = 1; itr <= iterations; itr++) {
- for (int j=0; j0x%08x \n", testInput[0]);
- polar_encoder_timing(testInput, encoderOutput, currentPtr, cpu_freq_GHz, logFile);
- }
- }
- fclose(logFile);
- free(testInput);
- free(encoderOutput);
- free(modulatedInput);
- free(channelOutput);
- free(estimatedOutput);
- return (0);
+ fprintf(logFile,
+ ",timeEncoderCRCByte[us],timeEncoderCRCBit[us],timeEncoderInterleaver[us],timeEncoderBitInsertion[us],timeEncoder1[us],timeEncoder2[us],timeEncoderRateMatching[us],timeEncoderByte2Bit[us]\n");
+#else
+ fprintf(logFile,",SNR,nBitError,blockErrorState,t_encoder[us],t_decoder[us]\n");
#endif
+ uint8_t testArrayLength = ceil(testLength / 32.0);
+ uint8_t coderArrayLength = ceil(coderLength / 32.0);
+ uint32_t testInput[testArrayLength]; //generate randomly
+ uint32_t encoderOutput[coderArrayLength];
+ uint32_t estimatedOutput[testArrayLength]; //decoder output
+ memset(testInput,0,sizeof(uint32_t) * testArrayLength);
+ memset(encoderOutput,0,sizeof(uint32_t) * coderArrayLength);
+ memset(estimatedOutput,0,sizeof(uint32_t) * testArrayLength);
+ uint8_t encoderOutputByte[coderLength];
+ double modulatedInput[coderLength]; //channel input
+ double channelOutput[coderLength]; //add noise
+ int16_t channelOutput_int16[coderLength];
+ t_nrPolar_params *currentPtr = nr_polar_params(polarMessageType, testLength, aggregation_level);
+#ifdef DEBUG_DCI_POLAR_PARAMS
+ uint32_t dci_pdu[4];
+ memset(dci_pdu,0,sizeof(uint32_t)*4);
+ dci_pdu[0]=0x01189400;
+ printf("dci_pdu: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ dci_pdu[0], dci_pdu[1], dci_pdu[2], dci_pdu[3]);
+ uint32_t encoder_output[54];
+ memset(encoder_output,0,sizeof(uint32_t)*54);
+ uint16_t size=41;
+ uint16_t rnti=3;
+ aggregation_level=8;
+ t_nrPolar_params *currentPtrDCI=nr_polar_params(1, size, aggregation_level);
+ polar_encoder_dci(dci_pdu, encoder_output, currentPtrDCI, rnti);
- // We assume no a priori knowledge available about the payload.
- double aPrioriArray[currentPtr->payloadBits];
- for (int i=0; ipayloadBits; i++) aPrioriArray[i] = NAN;
+ for (int i=0; i<54; i++)
+ printf("encoder_output: [%2d]->0x%08x \n",i, encoder_output[i]);
- for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
- printf("SNR %f\n",SNR);
- SNR_lin = pow(10, SNR/10);
- for (itr = 1; itr <= iterations; itr++) {
+ uint8_t *encoder_outputByte = malloc(sizeof(uint8_t) * currentPtrDCI->encoderLength);
+ double *channel_output = malloc (sizeof(double) * currentPtrDCI->encoderLength);
+ uint32_t dci_estimation[4];
+ memset(dci_estimation,0,sizeof(uint32_t)*4);
+ printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
+ nr_bit2byte_uint32_8_t(encoder_output, currentPtrDCI->encoderLength, encoder_outputByte);
+ printf("[polartest] encoder_outputByte: ");
- for (int i = 0; i < testArrayLength; i++) {
- for (int j = 0; j < (sizeof(testInput[0])*8)-1; j++) {
- testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
- testInput[i]<<=1;
- }
- testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
- }
+ for (int i = 0; i < currentPtrDCI->encoderLength; i++) printf("%d-", encoder_outputByte[i]);
- /*printf("testInput: [0]->0x%08x\n", testInput[0]);
- for (int i=0; i<32; i++)
- printf("%d\n",(testInput[0]>>i)&1);*/
+ printf("\n");
+ for(int i=0; iencoderLength; i++) {
+ if (encoder_outputByte[i] == 0) {
+ channel_output[i]=1/sqrt(2);
+ } else {
+ channel_output[i]=(-1)/sqrt(2);
+ }
+ }
+ decoderState = polar_decoder_dci(channel_output,
+ dci_estimation,
+ currentPtrDCI,
+ NR_POLAR_DECODER_LISTSIZE,
+ NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
+ rnti);
+ printf("dci_estimation: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ dci_estimation[0], dci_estimation[1], dci_estimation[2], dci_estimation[3]);
+ free(encoder_outputByte);
+ free(channel_output);
+ return 0;
+#endif
+#ifdef DEBUG_CRC
+ uint32_t crc;
+ unsigned int poly24c = 0xb2b11700;
+ uint32_t testInputCRC[4];
+ testInputCRC[0]=0x00291880;
+ //testInputCRC[0]=0x01189400;
+ testInputCRC[1]=0x00000000;
+ testInputCRC[2]=0x00000000;
+ testInputCRC[3]=0x00000000;
+ uint32_t testInputcrc=0x01189400;
+ uint32_t testInputcrc2=0x00291880;
+ uint8_t testInputCRC2[8];
+ nr_crc_bit2bit_uint32_8_t(testInputCRC, 32, testInputCRC2);
+ printf("testInputCRC2: [0]->%x \t [1]->%x \t [2]->%x \t [3]->%x\n"
+ " [4]->%x \t [5]->%x \t [6]->%x \t [7]->%x\n",
+ testInputCRC2[0], testInputCRC2[1], testInputCRC2[2], testInputCRC2[3],
+ testInputCRC2[4], testInputCRC2[5], testInputCRC2[6], testInputCRC2[7]);
+ unsigned int crc41 = crc24c(testInputCRC, 32);
+ unsigned int crc65 = crc24c(testInputCRC, 56);
+ printf("crc41: [0]->0x%08x\tcrc65: [0]->0x%08x\n",crc41, crc65);
- int len_mod64=currentPtr->payloadBits&63;
- ((uint64_t*)testInput)[currentPtr->payloadBits/64]&=((((uint64_t)1)<>i)&1,i,(crc65>>i)&1);
- start_meas(&timeEncoder);
- if (decoder_int16==0)
- polar_encoder(testInput, encoderOutput, currentPtr);
- else
- polar_encoder_fast((uint64_t*)testInput, encoderOutput,0, currentPtr);
- //polar_encoder_fast((uint64_t*)testInput, (uint64_t*)encoderOutput,0, currentPtr);
- stop_meas(&timeEncoder);
- /*printf("encoderOutput: [0]->0x%08x\n", encoderOutput[0]);
- printf("encoderOutput: [1]->0x%08x\n", encoderOutput[1]);*/
+ crc = crc24c(testInputCRC, testLength)>>8;
- //Bit-to-byte:
- nr_bit2byte_uint32_8_t(encoderOutput, coderLength, encoderOutputByte);
+ for (int i=0; i<24; i++) printf("[i]=%d\n",(crc>>i)&1);
- //BPSK modulation
- for(int i=0; i0x%08x\n",crc);
+ //crcbit(testInputCRC, sizeof(test) - 1, poly24c));
+ testInputCRC[testLength>>3] = ((uint8_t *)&crc)[2];
+ testInputCRC[1+(testLength>>3)] = ((uint8_t *)&crc)[1];
+ testInputCRC[2+(testLength>>3)] = ((uint8_t *)&crc)[0];
+ printf("testInputCRC: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+ testInputCRC[0], testInputCRC[1], testInputCRC[2], testInputCRC[3]);
+ //uint32_t trial32 = 0xffffffff;
+ uint32_t trial32 = 0xf10fffff;
+ uint8_t a[4];
+ //memcpy(a, &trial32, sizeof(trial32));
+ *(uint32_t *)a = trial32;
+ unsigned char trial[4];
+ trial[0]=0xff;
+ trial[1]=0xff;
+ trial[2]=0x0f;
+ trial[3]=0xf1;
+ uint32_t trialcrc = crc24c(trial, 32);
+ uint32_t trialcrc32 = crc24c((uint8_t *)&trial32, 32);
+ //uint32_t trialcrc32 = crc24c(a, 32);
+ printf("crcbit(trial = %x\n", crcbit(trial, 4, poly24c));
+ printf("trialcrc = %x\n", trialcrc);
+ printf("trialcrc32 = %x\n", trialcrc32);
- channelOutput[i] = modulatedInput[i] + (gaussdouble(0.0,1.0) * (1/sqrt(2*SNR_lin)));
+ for (int i=0; i<32; i++) printf("trialcrc[%2d]=%d\ttrialcrc32[%2d]=%d\n",i,(trialcrc>>i)&1,i,(trialcrc32>>i)&1);
-
- if (decoder_int16==1) {
- if (channelOutput[i] > 15) channelOutput_int16[i] = 127;
- else if (channelOutput[i] < -16) channelOutput_int16[i] = -128;
- else channelOutput_int16[i] = (int16_t) (8*channelOutput[i]);
- }
+ //uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+ uint8_t nr_polar_A[32] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,1};
+ uint8_t nr_polar_crc[24];
+ uint8_t **crc_generator_matrix = crc24c_generator_matrix(32);
+ nr_matrix_multiplication_uint8_1D_uint8_2D(nr_polar_A,
+ crc_generator_matrix,
+ nr_polar_crc,
+ 32,
+ 24);
+ for (uint8_t i = 0; i < 24; i++) {
+ nr_polar_crc[i] = (nr_polar_crc[i] % 2);
+ printf("nr_polar_crc[%d]=%d\n",i,nr_polar_crc[i]);
+ }
- }
+ return 0;
+#endif
+#ifdef DEBUG_POLAR_TIMING
- start_meas(&timeDecoder);
- /*decoderState = polar_decoder(channelOutput,
- estimatedOutput,
- currentPtr,
- NR_POLAR_DECODER_LISTSIZE,
- aPrioriArray,
- NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION);*/
- if (decoder_int16==0)
- decoderState = polar_decoder_aPriori(channelOutput,
- estimatedOutput,
- currentPtr,
- NR_POLAR_DECODER_LISTSIZE,
- NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
- aPrioriArray);
- else
- decoderState = polar_decoder_int16(channelOutput_int16,
- (uint64_t*)estimatedOutput,
- currentPtr);
+ for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
+ SNR_lin = pow(10, SNR / 10);
-
- stop_meas(&timeDecoder);
- /*printf("testInput: [0]->0x%08x\n", testInput[0]);
- printf("estimatedOutput: [0]->0x%08x\n", estimatedOutput[0]);*/
+ for (itr = 1; itr <= iterations; itr++) {
+ for (int j=0; j0x%08x \n", testInput[0]);
+ polar_encoder_timing(testInput, encoderOutput, currentPtr, cpu_freq_GHz, logFile);
+ }
+ }
- //calculate errors
- if (decoderState!=0) {
- blockErrorState=-1;
- nBitError=-1;
- } else {
- for (int j = 0; j < currentPtr->payloadBits; j++) {
- if (((estimatedOutput[0]>>j) & 1) != ((testInput[0]>>j) & 1)) nBitError++;
- // printf("bit %d: %d => %d\n",j,(testInput[0]>>j)&1,(estimatedOutput[0]>>j)&1);
- }
-
+ fclose(logFile);
+ free(testInput);
+ free(encoderOutput);
+ free(modulatedInput);
+ free(channelOutput);
+ free(estimatedOutput);
+ return (0);
+#endif
+ // We assume no a priori knowledge available about the payload.
+ double aPrioriArray[currentPtr->payloadBits];
- if (nBitError>0) {
- blockErrorState=1;
- // printf("Error: Input %x, Output %x\n",testInput[0],estimatedOutput[0]);
- }
- }
+ for (int i=0; ipayloadBits; i++) aPrioriArray[i] = NAN;
- //Iteration times are in microseconds.
- timeEncoderCumulative+=(timeEncoder.diff/(cpu_freq_GHz*1000.0));
- timeDecoderCumulative+=(timeDecoder.diff/(cpu_freq_GHz*1000.0));
- fprintf(logFile,",%f,%d,%d,%f,%f\n", SNR, nBitError, blockErrorState,
- (timeEncoder.diff/(cpu_freq_GHz*1000.0)), (timeDecoder.diff/(cpu_freq_GHz*1000.0)));
+ for (SNR = SNRstart; SNR <= SNRstop; SNR += SNRinc) {
+ printf("SNR %f\n",SNR);
+ SNR_lin = pow(10, SNR/10);
- if (nBitError<0) {
- blockErrorCumulative++;
- bitErrorCumulative+=testLength;
- } else {
- blockErrorCumulative+=blockErrorState;
- bitErrorCumulative+=nBitError;
- }
+ for (itr = 1; itr <= iterations; itr++) {
+ for (int i = 0; i < testArrayLength; i++) {
+ for (int j = 0; j < (sizeof(testInput[0])*8)-1; j++) {
+ testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
+ testInput[i]<<=1;
+ }
- decoderState=0;
- nBitError=0;
- blockErrorState=0;
+ testInput[i] |= ( ((uint32_t) (rand()%2)) &1);
+ }
- }
- //Calculate error statistics for the SNR.
- printf("[ListSize=%d, Appr=%d] SNR=%+8.3f, BLER=%9.6f, BER=%12.9f, t_Encoder=%9.3fus, t_Decoder=%9.3fus\n",
- decoderListSize, pathMetricAppr, SNR, ((double)blockErrorCumulative/iterations),
- ((double)bitErrorCumulative / (iterations*testLength)),
- (double)timeEncoder.diff/timeEncoder.trials/(cpu_freq_GHz*1000.0),(double)timeDecoder.diff/timeDecoder.trials/(cpu_freq_GHz*1000.0));
- //(timeEncoderCumulative/iterations),timeDecoderCumulative/iterations);
+ /*printf("testInput: [0]->0x%08x\n", testInput[0]);
+ for (int i=0; i<32; i++)
+ printf("%d\n",(testInput[0]>>i)&1);*/
+ int len_mod64=currentPtr->payloadBits&63;
+ ((uint64_t *)testInput)[currentPtr->payloadBits/64]&=((((uint64_t)1)<0x%08x\n", encoderOutput[0]);
+ printf("encoderOutput: [1]->0x%08x\n", encoderOutput[1]);*/
+ //Bit-to-byte:
+ nr_bit2byte_uint32_8_t(encoderOutput, coderLength, encoderOutputByte);
- print_meas(&timeEncoder,"polar_encoder",NULL,NULL);
- print_meas(&timeDecoder,"polar_decoder",NULL,NULL);
+ //BPSK modulation
+ for(int i=0; i 15) channelOutput_int16[i] = 127;
+ else if (channelOutput[i] < -16) channelOutput_int16[i] = -128;
+ else channelOutput_int16[i] = (int16_t) (8*channelOutput[i]);
+ }
+ }
+
+ start_meas(&timeDecoder);
+
+ /*decoderState = polar_decoder(channelOutput,
+ estimatedOutput,
+ currentPtr,
+ NR_POLAR_DECODER_LISTSIZE,
+ aPrioriArray,
+ NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION);*/
+ if (decoder_int16==0)
+ decoderState = polar_decoder_aPriori(channelOutput,
+ estimatedOutput,
+ currentPtr,
+ NR_POLAR_DECODER_LISTSIZE,
+ NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
+ aPrioriArray);
+ else
+ decoderState = polar_decoder_int16(channelOutput_int16,
+ (uint64_t *)estimatedOutput,
+ currentPtr);
+
+ stop_meas(&timeDecoder);
+ /*printf("testInput: [0]->0x%08x\n", testInput[0]);
+ printf("estimatedOutput: [0]->0x%08x\n", estimatedOutput[0]);*/
+
+ //calculate errors
+ if (decoderState!=0) {
+ blockErrorState=-1;
+ nBitError=-1;
+ } else {
+ for (int j = 0; j < currentPtr->payloadBits; j++) {
+ if (((estimatedOutput[0]>>j) & 1) != ((testInput[0]>>j) & 1)) nBitError++;
+
+ // printf("bit %d: %d => %d\n",j,(testInput[0]>>j)&1,(estimatedOutput[0]>>j)&1);
+ }
+
+ if (nBitError>0) {
+ blockErrorState=1;
+ // printf("Error: Input %x, Output %x\n",testInput[0],estimatedOutput[0]);
+ }
+ }
+
+ //Iteration times are in microseconds.
+ timeEncoderCumulative+=(timeEncoder.diff/(cpu_freq_GHz*1000.0));
+ timeDecoderCumulative+=(timeDecoder.diff/(cpu_freq_GHz*1000.0));
+ fprintf(logFile,",%f,%d,%d,%f,%f\n", SNR, nBitError, blockErrorState,
+ (timeEncoder.diff/(cpu_freq_GHz*1000.0)), (timeDecoder.diff/(cpu_freq_GHz*1000.0)));
+
+ if (nBitError<0) {
+ blockErrorCumulative++;
+ bitErrorCumulative+=testLength;
+ } else {
+ blockErrorCumulative+=blockErrorState;
+ bitErrorCumulative+=nBitError;
+ }
+
+ decoderState=0;
+ nBitError=0;
+ blockErrorState=0;
+ }
+
+ //Calculate error statistics for the SNR.
+ printf("[ListSize=%d, Appr=%d] SNR=%+8.3f, BLER=%9.6f, BER=%12.9f, t_Encoder=%9.3fus, t_Decoder=%9.3fus\n",
+ decoderListSize, pathMetricAppr, SNR, ((double)blockErrorCumulative/iterations),
+ ((double)bitErrorCumulative / (iterations*testLength)),
+ (double)timeEncoder.diff/timeEncoder.trials/(cpu_freq_GHz*1000.0),(double)timeDecoder.diff/timeDecoder.trials/(cpu_freq_GHz*1000.0));
+ //(timeEncoderCumulative/iterations),timeDecoderCumulative/iterations);
+
+ if (blockErrorCumulative==0 && bitErrorCumulative==0)
+ break;
+
+ blockErrorCumulative = 0;
+ bitErrorCumulative = 0;
+ timeEncoderCumulative = 0;
+ timeDecoderCumulative = 0;
+ }
+
+ print_meas(&timeEncoder,"polar_encoder",NULL,NULL);
+ print_meas(&timeDecoder,"polar_decoder",NULL,NULL);
+ fclose(logFile);
+ return (0);
}
diff --git a/openair1/PHY/CODING/coding_defs.h b/openair1/PHY/CODING/coding_defs.h
index 2040faf4a2..0f316e7869 100644
--- a/openair1/PHY/CODING/coding_defs.h
+++ b/openair1/PHY/CODING/coding_defs.h
@@ -467,33 +467,26 @@ void nr_interleaving_ldpc(uint32_t E, uint8_t Qm, uint8_t *e,uint8_t *f);
void nr_deinterleaving_ldpc(uint32_t E, uint8_t Qm, int16_t *e,int16_t *f);
-uint32_t nr_rate_matching_ldpc(uint8_t Ilbrm,
- uint32_t Tbslbrm,
- uint8_t BG,
- uint16_t Z,
- uint32_t G,
- uint8_t *w,
- uint8_t *e,
- uint8_t C,
- uint8_t rvidx,
- uint8_t Qm,
- uint8_t Nl,
- uint8_t r);
+int nr_rate_matching_ldpc(uint8_t Ilbrm,
+ uint32_t Tbslbrm,
+ uint8_t BG,
+ uint16_t Z,
+ uint8_t *w,
+ uint8_t *e,
+ uint8_t C,
+ uint8_t rvidx,
+ uint32_t E);
int nr_rate_matching_ldpc_rx(uint8_t Ilbrm,
- uint32_t Tbslbrm,
- uint8_t BG,
- uint16_t Z,
- uint32_t G,
+ uint32_t Tbslbrm,
+ uint8_t BG,
+ uint16_t Z,
int16_t *w,
int16_t *soft_input,
uint8_t C,
uint8_t rvidx,
uint8_t clear,
- uint8_t Qm,
- uint8_t Nl,
- uint8_t r,
- uint32_t *E_out);
+ uint32_t E);
decoder_if_t phy_threegpplte_turbo_decoder;
decoder_if_t phy_threegpplte_turbo_decoder8;
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
index 305a9c6266..cc90247c12 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
@@ -40,1020 +40,1101 @@
#include "assertions.h"
int8_t polar_decoder(
- double *input,
- uint8_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr)
-{
- //Assumes no a priori knowledge.
+ double *input,
+ uint8_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr) {
+ //Assumes no a priori knowledge.
+ uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- for (int i=0; i<(2*listSize); i++) {
- pathMetric[i] = 0;
- crcState[i]=1;
- }
- for (int i=0; iN; i++) {
- llrUpdated[i][polarParams->n]=1;
- bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
- }
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i = 0; i < polarParams->K; i++){
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i=0; ipayloadBits; i++) {
- for (int j=0; jcrcParityBits; j++) {
- tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
- }
- }
- for (int i=polarParams->payloadBits; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- if( (i-polarParams->payloadBits) == j ){
- tempECGM[i][j]=1;
- } else {
- tempECGM[i][j]=0;
- }
- }
- }
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- for (int i=0; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
- }
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
+ }
+ }
- //The index of the last 1-valued bit that appears in each column.
- uint16_t last1ind[polarParams->crcParityBits];
- for (int j=0; jcrcParityBits; j++) {
- for (int i=0; iK; i++) {
- if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
- }
- }
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
- nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
- /*
- * SCL polar decoder.
- */
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
- uint32_t nonFrozenBit=0;
- uint8_t currentListSize=1;
- uint8_t decoderIterationCheck=0;
- int16_t checkCrcBits=-1;
- uint8_t listIndex[2*listSize], copyIndex;
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (uint16_t currentBit=0; currentBitN; currentBit++){
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
- } else { //Information or CRC bit.
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
- for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
- bit[j][k][i+currentListSize]=bit[j][k][i];
- llr[j][k][i+currentListSize]=llr[j][k][i];}}}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
- for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
- currentListSize*=2;
+ /*
+ * SCL polar decoder.
+ */
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
- //Keep only the best "listSize" number of entries.
- if (currentListSize > listSize) {
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
- uint8_t swaps, tempInd;
- for (uint8_t i = 0; i < listSize; i++) {
- swaps = 0;
- for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
- if (listIndex[j+1] > listIndex[j]) {
- tempInd = listIndex[j];
- listIndex[j] = listIndex[j + 1];
- listIndex[j + 1] = tempInd;
- swaps++;
- }
- }
- if (swaps == 0)
- break;
- }
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
- //First, backup the best "listSize" number of entries.
- for (int k=(listSize-1); k>0; k--) {
- for (int i=0; iN; i++) {
- for (int j=0; j<(polarParams->n+1); j++) {
- bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
- llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
- }
- }
- }
- for (int k=(listSize-1); k>0; k--) {
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
- }
- }
- for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
- //Copy the best "listSize" number of entries to the first indices.
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->N; i++) {
- for (int j = 0; j < (polarParams->n + 1); j++) {
- bit[i][j][k] = bit[i][j][copyIndex];
- llr[i][j][k] = llr[i][j][copyIndex];
- }
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][k]=crcChecksum[i][copyIndex];
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- crcState[k]=crcState[copyIndex];
- }
- currentListSize = listSize;
- }
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- for (int i=0; icrcParityBits; i++) {
- if (last1ind[i]==nonFrozenBit) {
- checkCrcBits=i;
- break;
- }
- }
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
- if ( checkCrcBits > (-1) ) {
- for (uint8_t i = 0; i < currentListSize; i++) {
- if (crcChecksum[checkCrcBits][i]==1) {
- crcState[i]=0; //0=False, 1=True
- }
- }
- }
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
- if (decoderIterationCheck==0) {
- //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- return(-1);
- }
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
- nonFrozenBit++;
- decoderIterationCheck=0;
- checkCrcBits=-1;
- }
- }
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
- for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
- if ( crcState[listIndex[i]] == 1 ) {
- for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+ if (swaps == 0)
+ break;
+ }
- //Extract the information bits (û to ĉ)
- nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
- //Deinterleaving (ĉ to b)
- nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
-
- //Remove the CRC (â)
- for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
- break;
- }
- }
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
- /*
- * Return bits.
- */
- //nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]==1) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ //nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
}
int8_t polar_decoder_aPriori(double *input,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- double *aPrioriPayload)
-{
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload) {
uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- for (int i=0; i<(2*listSize); i++) {
- pathMetric[i] = 0;
- crcState[i]=1;
- }
- for (int i=0; iN; i++) {
- llrUpdated[i][polarParams->n]=1;
- bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
- }
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i = 0; i < polarParams->K; i++){
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- for (int i=0; ipayloadBits; i++) {
- for (int j=0; jcrcParityBits; j++) {
- tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
- }
- }
- for (int i=polarParams->payloadBits; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- if( (i-polarParams->payloadBits) == j ){
- tempECGM[i][j]=1;
- } else {
- tempECGM[i][j]=0;
- }
- }
- }
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i=0; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
- }
- }
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- //The index of the last 1-valued bit that appears in each column.
- uint16_t last1ind[polarParams->crcParityBits];
- for (int j=0; jcrcParityBits; j++) {
- for (int i=0; iK; i++) {
- if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
- }
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
+ }
+ }
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
- nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
- /*
- * SCL polar decoder.
- */
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
- uint32_t nonFrozenBit=0;
- uint8_t currentListSize=1;
- uint8_t decoderIterationCheck=0;
- int16_t checkCrcBits=-1;
- uint8_t listIndex[2*listSize], copyIndex;
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
- for (uint16_t currentBit=0; currentBitN; currentBit++){
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
- } else { //Information or CRC bit.
- if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
- (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 0) ) {
- //Information bit with known value of "0".
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr);
- bitUpdated[currentBit][0]=1; //0=False, 1=True
- } else if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
- (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 1) ) {
- //Information bit with known value of "1".
- updatePathMetric(pathMetric, llr, currentListSize, 1, currentBit, pathMetricAppr);
- for (uint8_t i=0; icrcParityBits);
- } else {
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
- for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
- bit[j][k][i+currentListSize]=bit[j][k][i];
- llr[j][k][i+currentListSize]=llr[j][k][i];}}}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
- for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
- currentListSize*=2;
+ /*
+ * SCL polar decoder.
+ */
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
- //Keep only the best "listSize" number of entries.
- if (currentListSize > listSize) {
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
- uint8_t swaps, tempInd;
- for (uint8_t i = 0; i < listSize; i++) {
- swaps = 0;
- for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
- if (listIndex[j+1] > listIndex[j]) {
- tempInd = listIndex[j];
- listIndex[j] = listIndex[j + 1];
- listIndex[j + 1] = tempInd;
- swaps++;
- }
- }
- if (swaps == 0)
- break;
- }
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 0) ) {
+ //Information bit with known value of "0".
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr);
+ bitUpdated[currentBit][0]=1; //0=False, 1=True
+ } else if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 1) ) {
+ //Information bit with known value of "1".
+ updatePathMetric(pathMetric, llr, currentListSize, 1, currentBit, pathMetricAppr);
- //First, backup the best "listSize" number of entries.
- for (int k=(listSize-1); k>0; k--) {
- for (int i=0; iN; i++) {
- for (int j=0; j<(polarParams->n+1); j++) {
- bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
- llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
- }
- }
- }
- for (int k=(listSize-1); k>0; k--) {
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
- }
- }
- for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ for (uint8_t i=0; i listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->N; i++) {
- for (int j = 0; j < (polarParams->n + 1); j++) {
- bit[i][j][k] = bit[i][j][copyIndex];
- llr[i][j][k] = llr[i][j][copyIndex];
- }
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][k]=crcChecksum[i][copyIndex];
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- crcState[k]=crcState[copyIndex];
- }
- currentListSize = listSize;
- }
- }
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ } else {
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
- for (int i=0; icrcParityBits; i++) {
- if (last1ind[i]==nonFrozenBit) {
- checkCrcBits=i;
- break;
- }
- }
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
- if ( checkCrcBits > (-1) ) {
- for (uint8_t i = 0; i < currentListSize; i++) {
- if (crcChecksum[checkCrcBits][i]==1) {
- crcState[i]=0; //0=False, 1=True
- }
- }
- }
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
- if (decoderIterationCheck==0) {
- //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- return(-1);
- }
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- nonFrozenBit++;
- decoderIterationCheck=0;
- checkCrcBits=-1;
- }
- }
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
- if ( crcState[listIndex[i]] == 1 ) {
- for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
- //Extract the information bits (û to ĉ)
- nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
- //Deinterleaving (ĉ to b)
- nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
- //Remove the CRC (â)
- for (int j = 0; j < polarParams->payloadBits; j++)
- polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
- break;
- }
- }
+ if (swaps == 0)
+ break;
+ }
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
- /*
- * Return bits.
- */
- nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
- return(0);
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]==1) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++)
+ polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
}
int8_t polar_decoder_aPriori_timing(double *input,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- double *aPrioriPayload,
- double cpuFreqGHz,
- FILE* logFile)
-{
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload,
+ double cpuFreqGHz,
+ FILE *logFile) {
+ uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- for (int i=0; i<(2*listSize); i++) {
- pathMetric[i] = 0;
- crcState[i]=1;
- }
- for (int i=0; iN; i++) {
- llrUpdated[i][polarParams->n]=1;
- bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
- }
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i = 0; i < polarParams->K; i++){
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
- for (int i=0; ipayloadBits; i++) {
- for (int j=0; jcrcParityBits; j++) {
- tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
- }
- }
- for (int i=polarParams->payloadBits; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- if( (i-polarParams->payloadBits) == j ){
- tempECGM[i][j]=1;
- } else {
- tempECGM[i][j]=0;
- }
- }
- }
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- for (int i=0; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
- }
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
+ }
+ }
- //The index of the last 1-valued bit that appears in each column.
- uint16_t last1ind[polarParams->crcParityBits];
- for (int j=0; jcrcParityBits; j++) {
- for (int i=0; iK; i++) {
- if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
- }
- }
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
- nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
- /*
- * SCL polar decoder.
- */
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
- uint32_t nonFrozenBit=0;
- uint8_t currentListSize=1;
- uint8_t decoderIterationCheck=0;
- int16_t checkCrcBits=-1;
- uint8_t listIndex[2*listSize], copyIndex;
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (uint16_t currentBit=0; currentBitN; currentBit++){
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
- } else { //Information or CRC bit.
- if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
- (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 0) ) {
- //Information bit with known value of "0".
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr);
- bitUpdated[currentBit][0]=1; //0=False, 1=True
- } else if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
- (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 1) ) {
- //Information bit with known value of "1".
- updatePathMetric(pathMetric, llr, currentListSize, 1, currentBit, pathMetricAppr);
- for (uint8_t i=0; icrcParityBits);
- } else {
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
- for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
- bit[j][k][i+currentListSize]=bit[j][k][i];
- llr[j][k][i+currentListSize]=llr[j][k][i];}}}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
- for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
- currentListSize*=2;
+ /*
+ * SCL polar decoder.
+ */
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
- //Keep only the best "listSize" number of entries.
- if (currentListSize > listSize) {
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
- uint8_t swaps, tempInd;
- for (uint8_t i = 0; i < listSize; i++) {
- swaps = 0;
- for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
- if (listIndex[j+1] > listIndex[j]) {
- tempInd = listIndex[j];
- listIndex[j] = listIndex[j + 1];
- listIndex[j + 1] = tempInd;
- swaps++;
- }
- }
- if (swaps == 0)
- break;
- }
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 0) ) {
+ //Information bit with known value of "0".
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr);
+ bitUpdated[currentBit][0]=1; //0=False, 1=True
+ } else if ( (polarParams->interleaving_pattern[nonFrozenBit] <= polarParams->payloadBits) &&
+ (aPrioriPayload[polarParams->interleaving_pattern[nonFrozenBit]] == 1) ) {
+ //Information bit with known value of "1".
+ updatePathMetric(pathMetric, llr, currentListSize, 1, currentBit, pathMetricAppr);
- //First, backup the best "listSize" number of entries.
- for (int k=(listSize-1); k>0; k--) {
- for (int i=0; iN; i++) {
- for (int j=0; j<(polarParams->n+1); j++) {
- bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
- llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
- }
- }
- }
- for (int k=(listSize-1); k>0; k--) {
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
- }
- }
- for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ for (uint8_t i=0; i listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->N; i++) {
- for (int j = 0; j < (polarParams->n + 1); j++) {
- bit[i][j][k] = bit[i][j][copyIndex];
- llr[i][j][k] = llr[i][j][copyIndex];
- }
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][k]=crcChecksum[i][copyIndex];
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- crcState[k]=crcState[copyIndex];
- }
- currentListSize = listSize;
- }
- }
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ } else {
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
- for (int i=0; icrcParityBits; i++) {
- if (last1ind[i]==nonFrozenBit) {
- checkCrcBits=i;
- break;
- }
- }
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
- if ( checkCrcBits > (-1) ) {
- for (uint8_t i = 0; i < currentListSize; i++) {
- if (crcChecksum[checkCrcBits][i]==1) {
- crcState[i]=0; //0=False, 1=True
- }
- }
- }
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
- if (decoderIterationCheck==0) {
- //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- return(-1);
- }
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- nonFrozenBit++;
- decoderIterationCheck=0;
- checkCrcBits=-1;
- }
- }
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
- if ( crcState[listIndex[i]] == 1 ) {
- for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
- //Extract the information bits (û to ĉ)
- nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
- //Deinterleaving (ĉ to b)
- nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
- //Remove the CRC (â)
- for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+ if (swaps == 0)
+ break;
+ }
- break;
- }
- }
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
- /*
- * Return bits.
- */
- nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]==1) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
}
int8_t polar_decoder_dci(double *input,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- uint16_t n_RNTI)
-{
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ uint16_t n_RNTI) {
+ uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
+ double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
+ uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
+ double *pathMetric = malloc(sizeof(double)*(2*listSize));
+ uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ uint8_t extended_crc_scrambling_pattern[polarParams->crcParityBits];
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
- uint8_t extended_crc_scrambling_pattern[polarParams->crcParityBits];
+ for (int i=0; i<(2*listSize); i++) {
+ pathMetric[i] = 0;
+ crcState[i]=1;
+ }
- for (int i=0; i<(2*listSize); i++) {
- pathMetric[i] = 0;
- crcState[i]=1;
- }
- for (int i=0; iN; i++) {
- llrUpdated[i][polarParams->n]=1;
- bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
- }
+ for (int i=0; iN; i++) {
+ llrUpdated[i][polarParams->n]=1;
+ bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
+ }
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3: K-by-P
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2: K-by-P
- for (int i = 0; i < polarParams->K; i++){
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3: K-by-P
+ uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2: K-by-P
- for (int i=0; ipayloadBits; i++) {
- for (int j=0; jcrcParityBits; j++) {
- tempECGM[i][j]=polarParams->crc_generator_matrix[i+polarParams->crcParityBits][j];
- }
- }
- for (int i=polarParams->payloadBits; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- if( (i-polarParams->payloadBits) == j ){
- tempECGM[i][j]=1;
- } else {
- tempECGM[i][j]=0;
- }
- }
- }
+ for (int i = 0; i < polarParams->K; i++) {
+ extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
+ }
- for (int i=0; iK; i++) {
- for (int j=0; jcrcParityBits; j++) {
- extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
- }
- }
+ for (int i=0; ipayloadBits; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ tempECGM[i][j]=polarParams->crc_generator_matrix[i+polarParams->crcParityBits][j];
+ }
+ }
- //The index of the last 1-valued bit that appears in each column.
- uint16_t last1ind[polarParams->crcParityBits];
- for (int j=0; jcrcParityBits; j++) {
- for (int i=0; iK; i++) {
- if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
- }
- }
+ for (int i=polarParams->payloadBits; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ if( (i-polarParams->payloadBits) == j ) {
+ tempECGM[i][j]=1;
+ } else {
+ tempECGM[i][j]=0;
+ }
+ }
+ }
- for (int i=0;i<8;i++) extended_crc_scrambling_pattern[i]=0;
- for (int i=8; icrcParityBits; i++) {
- extended_crc_scrambling_pattern[i]=(n_RNTI>>(23-i))&1;
- }
+ for (int i=0; iK; i++) {
+ for (int j=0; jcrcParityBits; j++) {
+ extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
+ }
+ }
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
- nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ //The index of the last 1-valued bit that appears in each column.
+ uint16_t last1ind[polarParams->crcParityBits];
- /*
- * SCL polar decoder.
- */
+ for (int j=0; jcrcParityBits; j++) {
+ for (int i=0; iK; i++) {
+ if (extended_crc_generator_matrix[i][j]==1) last1ind[j]=i;
+ }
+ }
- for (int i=0; icrcParityBits; i++) {
- for (int j=0; jcrcParityBits; j++) crcChecksum[i][0]=crcChecksum[i][0]+polarParams->crc_generator_matrix[j][i];
- crcChecksum[i][0]=(crcChecksum[i][0]%2);
- }
+ for (int i=0; i<8; i++) extended_crc_scrambling_pattern[i]=0;
- uint32_t nonFrozenBit=0;
- uint8_t currentListSize=1;
- uint8_t decoderIterationCheck=0;
- int16_t checkCrcBits=-1;
- uint8_t listIndex[2*listSize], copyIndex;
+ for (int i=8; icrcParityBits; i++) {
+ extended_crc_scrambling_pattern[i]=(n_RNTI>>(23-i))&1;
+ }
- for (uint16_t currentBit=0; currentBitN; currentBit++){
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
- } else { //Information or CRC bit.
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
+ double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
- bit[j][k][i+currentListSize]=bit[j][k][i];
- llr[j][k][i+currentListSize]=llr[j][k][i];}}}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
- for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
- currentListSize*=2;
+ for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
- //Keep only the best "listSize" number of entries.
- if (currentListSize > listSize) {
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ /*
+ * SCL polar decoder.
+ */
- //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
- uint8_t swaps, tempInd;
- for (uint8_t i = 0; i < listSize; i++) {
- swaps = 0;
- for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
- if (listIndex[j+1] > listIndex[j]) {
- tempInd = listIndex[j];
- listIndex[j] = listIndex[j + 1];
- listIndex[j + 1] = tempInd;
- swaps++;
- }
- }
- if (swaps == 0)
- break;
- }
+ for (int i=0; icrcParityBits; i++) {
+ for (int j=0; jcrcParityBits; j++) crcChecksum[i][0]=crcChecksum[i][0]+polarParams->crc_generator_matrix[j][i];
- //First, backup the best "listSize" number of entries.
- for (int k=(listSize-1); k>0; k--) {
- for (int i=0; iN; i++) {
- for (int j=0; j<(polarParams->n+1); j++) {
- bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
- llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
- }
- }
- }
- for (int k=(listSize-1); k>0; k--) {
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
- }
- }
- for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+ crcChecksum[i][0]=(crcChecksum[i][0]%2);
+ }
- //Copy the best "listSize" number of entries to the first indices.
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->N; i++) {
- for (int j = 0; j < (polarParams->n + 1); j++) {
- bit[i][j][k] = bit[i][j][copyIndex];
- llr[i][j][k] = llr[i][j][copyIndex];
- }
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- for (int i = 0; i < polarParams->crcParityBits; i++) {
- crcChecksum[i][k]=crcChecksum[i][copyIndex];
- }
- }
- for (int k = 0; k < listSize; k++) {
- if (k > listIndex[k]) {
- copyIndex = listIndex[(2*listSize-1)-k];
- } else { //Use the backup.
- copyIndex = listIndex[k];
- }
- crcState[k]=crcState[copyIndex];
- }
- currentListSize = listSize;
- }
+ uint32_t nonFrozenBit=0;
+ uint8_t currentListSize=1;
+ uint8_t decoderIterationCheck=0;
+ int16_t checkCrcBits=-1;
+ uint8_t listIndex[2*listSize], copyIndex;
- for (int i=0; icrcParityBits; i++) {
- if (last1ind[i]==nonFrozenBit) {
- checkCrcBits=i;
- break;
- }
- }
+ for (uint16_t currentBit=0; currentBitN; currentBit++) {
+ updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
- if ( checkCrcBits > (-1) ) {
- for (uint8_t i = 0; i < currentListSize; i++) {
- if (crcChecksum[checkCrcBits][i]!=extended_crc_scrambling_pattern[checkCrcBits]) {
- crcState[i]=0; //0=False, 1=True
- }
- }
- }
+ if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
+ updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit, pathMetricAppr); //approximation=0 --> 11b, approximation=1 --> 12
+ } else { //Information or CRC bit.
+ updatePathMetric2(pathMetric, llr, currentListSize, currentBit, pathMetricAppr);
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
- if (decoderIterationCheck==0) {
- //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- return(-1);
- }
+ for (int i = 0; i < currentListSize; i++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
+ bit[j][k][i+currentListSize]=bit[j][k][i];
+ llr[j][k][i+currentListSize]=llr[j][k][i];
+ }
+ }
+ }
- nonFrozenBit++;
- decoderIterationCheck=0;
- checkCrcBits=-1;
- }
- }
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
- for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
- for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
- if ( crcState[listIndex[i]] == 1 ) {
- for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+ bitUpdated[currentBit][0]=1;
+ updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ currentListSize*=2;
- //Extract the information bits (û to ĉ)
- nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Keep only the best "listSize" number of entries.
+ if (currentListSize > listSize) {
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
- //Deinterleaving (ĉ to b)
- nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+ //sort listIndex[listSize, ..., 2*listSize-1] in descending order.
+ uint8_t swaps, tempInd;
- //Remove the CRC (â)
- for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+ for (uint8_t i = 0; i < listSize; i++) {
+ swaps = 0;
- break;
- }
- }
+ for (uint8_t j = listSize; j < (2*listSize - i) - 1; j++) {
+ if (listIndex[j+1] > listIndex[j]) {
+ tempInd = listIndex[j];
+ listIndex[j] = listIndex[j + 1];
+ listIndex[j + 1] = tempInd;
+ swaps++;
+ }
+ }
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ if (swaps == 0)
+ break;
+ }
- /*
- * Return bits.
- */
- nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+ //First, backup the best "listSize" number of entries.
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i=0; iN; i++) {
+ for (int j=0; j<(polarParams->n+1); j++) {
+ bit[i][j][listIndex[(2*listSize-1)-k]]=bit[i][j][listIndex[k]];
+ llr[i][j][listIndex[(2*listSize-1)-k]]=llr[i][j][listIndex[k]];
+ }
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) {
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][listIndex[(2*listSize-1)-k]] = crcChecksum[i][listIndex[k]];
+ }
+ }
+
+ for (int k=(listSize-1); k>0; k--) crcState[listIndex[(2*listSize-1)-k]]=crcState[listIndex[k]];
+
+ //Copy the best "listSize" number of entries to the first indices.
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->N; i++) {
+ for (int j = 0; j < (polarParams->n + 1); j++) {
+ bit[i][j][k] = bit[i][j][copyIndex];
+ llr[i][j][k] = llr[i][j][copyIndex];
+ }
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ for (int i = 0; i < polarParams->crcParityBits; i++) {
+ crcChecksum[i][k]=crcChecksum[i][copyIndex];
+ }
+ }
+
+ for (int k = 0; k < listSize; k++) {
+ if (k > listIndex[k]) {
+ copyIndex = listIndex[(2*listSize-1)-k];
+ } else { //Use the backup.
+ copyIndex = listIndex[k];
+ }
+
+ crcState[k]=crcState[copyIndex];
+ }
+
+ currentListSize = listSize;
+ }
+
+ for (int i=0; icrcParityBits; i++) {
+ if (last1ind[i]==nonFrozenBit) {
+ checkCrcBits=i;
+ break;
+ }
+ }
+
+ if ( checkCrcBits > (-1) ) {
+ for (uint8_t i = 0; i < currentListSize; i++) {
+ if (crcChecksum[checkCrcBits][i]!=extended_crc_scrambling_pattern[checkCrcBits]) {
+ crcState[i]=0; //0=False, 1=True
+ }
+ }
+ }
+
+ for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+
+ if (decoderIterationCheck==0) {
+ //perror("[SCL polar decoder] All list entries have failed the CRC checks.");
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ return(-1);
+ }
+
+ nonFrozenBit++;
+ decoderIterationCheck=0;
+ checkCrcBits=-1;
+ }
+ }
+
+ for (uint8_t i = 0; i < 2*listSize; i++) listIndex[i]=i;
+
+ nr_sort_asc_double_1D_array_ind(pathMetric, listIndex, currentListSize);
+
+ for (uint8_t i = 0; i < fmin(listSize, (pow(2,polarParams->crcCorrectionBits)) ); i++) {
+ if ( crcState[listIndex[i]] == 1 ) {
+ for (int j = 0; j < polarParams->N; j++) polarParams->nr_polar_U[j]=bit[j][0][listIndex[i]];
+
+ //Extract the information bits (û to ĉ)
+ nr_polar_info_bit_extraction(polarParams->nr_polar_U, polarParams->nr_polar_CPrime, polarParams->information_bit_pattern, polarParams->N);
+ //Deinterleaving (ĉ to b)
+ nr_polar_deinterleaver(polarParams->nr_polar_CPrime, polarParams->nr_polar_B, polarParams->interleaving_pattern, polarParams->K);
+
+ //Remove the CRC (â)
+ for (int j = 0; j < polarParams->payloadBits; j++) polarParams->nr_polar_A[j]=polarParams->nr_polar_B[j];
+
+ break;
+ }
+ }
+
+ free(d_tilde);
+ free(pathMetric);
+ free(crcState);
+ nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
+ nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
+ nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+ nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
+ nr_free_uint8_2D_array(tempECGM, polarParams->K);
+ /*
+ * Return bits.
+ */
+ nr_byte2bit_uint8_32_t(polarParams->nr_polar_A, polarParams->payloadBits, out);
+ return(0);
}
void init_polar_deinterleaver_table(t_nrPolar_params *polarParams) {
-
AssertFatal(polarParams->K > 32, "K = %d < 33, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->K < 129, "K = %d > 128, is not supported yet\n",polarParams->K);
-
int bit_i,ip,ipmod64;
-
int numbytes = polarParams->K>>3;
int residue = polarParams->K&7;
int numbits;
+
if (residue>0) numbytes++;
- for (int byte=0;byteK>>3)) numbits=8;
else numbits=residue;
- for (int i=0;iK - 1 - polarParams->interleaving_pattern[(8*byte)+i];
#if 0
@@ -1061,108 +1142,97 @@ void init_polar_deinterleaver_table(t_nrPolar_params *polarParams) {
#endif
ipmod64 = ip&63;
AssertFatal(ip<128,"ip = %d\n",ip);
- for (int val=0;val<256;val++) {
- bit_i=(val>>i)&1;
- if (ip<64) polarParams->B_tab0[byte][val] |= (((uint64_t)bit_i)<B_tab1[byte][val] |= (((uint64_t)bit_i)<>i)&1;
+
+ if (ip<64) polarParams->B_tab0[byte][val] |= (((uint64_t)bit_i)<B_tab1[byte][val] |= (((uint64_t)bit_i)<N];// = malloc(sizeof(double) * polarParams->N);
-
nr_polar_rate_matching_int16(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int i=0;iN;i++) {
+
+ for (int i=0; iN; i++) {
if (d_tilde[i]<-128) d_tilde[i]=-128;
else if (d_tilde[i]>127) d_tilde[i]=128;
}
- memcpy((void*)&polarParams->tree.root->alpha[0],(void*)&d_tilde[0],sizeof(int16_t)*polarParams->N);
-
+ memcpy((void *)&polarParams->tree.root->alpha[0],(void *)&d_tilde[0],sizeof(int16_t)*polarParams->N);
generic_polar_decoder(polarParams,polarParams->tree.root);
-
-
//Extract the information bits (û to ĉ)
- uint64_t Cprime[4]={0,0,0,0};
- uint64_t B[4]={0,0,0,0};
- for (int i=0;iK;i++) Cprime[i>>6] = Cprime[i>>6] | ((uint64_t)polarParams->nr_polar_U[polarParams->Q_I_N[i]])<<(i&63);
+ uint64_t Cprime[4]= {0,0,0,0};
+ uint64_t B[4]= {0,0,0,0};
+
+ for (int i=0; iK; i++) Cprime[i>>6] = Cprime[i>>6] | ((uint64_t)polarParams->nr_polar_U[polarParams->Q_I_N[i]])<<(i&63);
//Deinterleaving (ĉ to b)
- uint8_t *Cprimebyte = (uint8_t*)Cprime;
+ uint8_t *Cprimebyte = (uint8_t *)Cprime;
+
if (polarParams->K<65) {
B[0] = polarParams->B_tab0[0][Cprimebyte[0]] |
- polarParams->B_tab0[1][Cprimebyte[1]] |
- polarParams->B_tab0[2][Cprimebyte[2]] |
- polarParams->B_tab0[3][Cprimebyte[3]] |
- polarParams->B_tab0[4][Cprimebyte[4]] |
- polarParams->B_tab0[5][Cprimebyte[5]] |
- polarParams->B_tab0[6][Cprimebyte[6]] |
- polarParams->B_tab0[7][Cprimebyte[7]];
- }
- else if (polarParams->K<129) {
+ polarParams->B_tab0[1][Cprimebyte[1]] |
+ polarParams->B_tab0[2][Cprimebyte[2]] |
+ polarParams->B_tab0[3][Cprimebyte[3]] |
+ polarParams->B_tab0[4][Cprimebyte[4]] |
+ polarParams->B_tab0[5][Cprimebyte[5]] |
+ polarParams->B_tab0[6][Cprimebyte[6]] |
+ polarParams->B_tab0[7][Cprimebyte[7]];
+ } else if (polarParams->K<129) {
int len = polarParams->K/8;
+
if ((polarParams->K&7) > 0) len++;
- for (int k=0;kB_tab0[k][Cprimebyte[k]];
B[1] |= polarParams->B_tab1[k][Cprimebyte[k]];
}
}
-
int len=polarParams->payloadBits;
//int len_mod64=len&63;
int crclen = polarParams->crcParityBits;
uint64_t rxcrc=B[0]&((1<>crclen);
uint8_t A32_flip[4];
uint32_t Aprime= (uint32_t)(Ar<<(32-len));
- A32_flip[0]=((uint8_t*)&Aprime)[3];
- A32_flip[1]=((uint8_t*)&Aprime)[2];
- A32_flip[2]=((uint8_t*)&Aprime)[1];
- A32_flip[3]=((uint8_t*)&Aprime)[0];
+ A32_flip[0]=((uint8_t *)&Aprime)[3];
+ A32_flip[1]=((uint8_t *)&Aprime)[2];
+ A32_flip[2]=((uint8_t *)&Aprime)[1];
+ A32_flip[3]=((uint8_t *)&Aprime)[0];
crc = (uint64_t)(crc24c(A32_flip,len)>>8);
- }
- else if (len<=64) {
+ } else if (len<=64) {
Ar = (B[0]>>crclen) | (B[1]<<(64-crclen));;
uint8_t A64_flip[8];
uint64_t Aprime= (uint32_t)(Ar<<(64-len));
- A64_flip[0]=((uint8_t*)&Aprime)[7];
- A64_flip[1]=((uint8_t*)&Aprime)[6];
- A64_flip[2]=((uint8_t*)&Aprime)[5];
- A64_flip[3]=((uint8_t*)&Aprime)[4];
- A64_flip[4]=((uint8_t*)&Aprime)[3];
- A64_flip[5]=((uint8_t*)&Aprime)[2];
- A64_flip[6]=((uint8_t*)&Aprime)[1];
- A64_flip[7]=((uint8_t*)&Aprime)[0];
+ A64_flip[0]=((uint8_t *)&Aprime)[7];
+ A64_flip[1]=((uint8_t *)&Aprime)[6];
+ A64_flip[2]=((uint8_t *)&Aprime)[5];
+ A64_flip[3]=((uint8_t *)&Aprime)[4];
+ A64_flip[4]=((uint8_t *)&Aprime)[3];
+ A64_flip[5]=((uint8_t *)&Aprime)[2];
+ A64_flip[6]=((uint8_t *)&Aprime)[1];
+ A64_flip[7]=((uint8_t *)&Aprime)[0];
crc = (uint64_t)(crc24c(A64_flip,len)>>8);
}
#if 0
printf("A %llx B %llx|%llx Cprime %llx|%llx (crc %x,rxcrc %llx %d)\n",
- Ar,
- B[1],B[0],Cprime[1],Cprime[0],crc,
- rxcrc,polarParams->payloadBits);
+ Ar,
+ B[1],B[0],Cprime[1],Cprime[0],crc,
+ rxcrc,polarParams->payloadBits);
#endif
-
out[0]=Ar;
-
-
return(crc^rxcrc);
-
-
-
}
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
index 68e9ef3571..d42e8bb6fc 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
@@ -81,7 +81,7 @@ struct nrPolar_params {
//messageType: 0=PBCH, 1=DCI, -1=UCI
int idx; //idx = (messageType * messageLength * aggregation_prime);
struct nrPolar_params *nextPtr;
-
+
uint8_t n_max;
uint8_t i_il;
uint8_t i_seg;
@@ -96,7 +96,7 @@ struct nrPolar_params {
uint16_t N;
uint8_t n;
uint32_t crcBit;
-
+
uint16_t *interleaving_pattern;
uint16_t *deinterleaving_pattern;
uint16_t *rate_matching_pattern;
@@ -107,7 +107,7 @@ struct nrPolar_params {
uint8_t *information_bit_pattern;
uint16_t *channel_interleaver_pattern;
uint32_t crc_polynomial;
-
+
uint8_t **crc_generator_matrix; //G_P
uint8_t **G_N;
uint64_t **G_N_tab;
@@ -117,7 +117,7 @@ struct nrPolar_params {
uint64_t cprime_tab1[32][256];
uint64_t B_tab0[32][256];
uint64_t B_tab1[32][256];
- uint32_t* crc256Table;
+ uint32_t *crc256Table;
uint8_t **extended_crc_generator_matrix;
//lowercase: bits, Uppercase: Bits stored in bytes
//polar_encoder vectors
@@ -126,89 +126,82 @@ struct nrPolar_params {
uint8_t *nr_polar_APrime;
uint8_t *nr_polar_D;
uint8_t *nr_polar_E;
-
+
//Polar Coding vectors
uint8_t *nr_polar_A;
uint8_t *nr_polar_CPrime;
uint8_t *nr_polar_B;
uint8_t *nr_polar_U;
-
+
decoder_tree_t tree;
} __attribute__ ((__packed__));
typedef struct nrPolar_params t_nrPolar_params;
-typedef t_nrPolar_params *t_nrPolar_paramsPtr;
void polar_encoder(uint32_t *input,
- uint32_t *output,
- t_nrPolar_paramsPtr polarParams);
+ uint32_t *output,
+ t_nrPolar_params *polarParams);
void polar_encoder_dci(uint32_t *in,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint16_t n_RNTI);
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint16_t n_RNTI);
void polar_encoder_fast(uint64_t *A,
- uint32_t *out,
- int32_t crcmask,
- t_nrPolar_paramsPtr polarParams);
+ uint32_t *out,
+ int32_t crcmask,
+ t_nrPolar_params *polarParams);
int8_t polar_decoder(double *input,
- uint8_t *output,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr);
+ uint8_t *output,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr);
uint32_t polar_decoder_int16(int16_t *input,
- uint64_t *out,
- t_nrPolar_params *polarParams);
+ uint64_t *out,
+ const t_nrPolar_params *polarParams);
int8_t polar_decoder_aPriori(double *input,
- uint32_t *output,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- double *aPrioriPayload);
+ uint32_t *output,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload);
int8_t polar_decoder_aPriori_timing(double *input,
- uint32_t *output,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- double *aPrioriPayload,
- double cpuFreqGHz,
- FILE* logFile);
+ uint32_t *output,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ double *aPrioriPayload,
+ double cpuFreqGHz,
+ FILE *logFile);
int8_t polar_decoder_dci(double *input,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint8_t listSize,
- uint8_t pathMetricAppr,
- uint16_t n_RNTI);
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint8_t listSize,
+ uint8_t pathMetricAppr,
+ uint16_t n_RNTI);
void generic_polar_decoder(t_nrPolar_params *,
- decoder_node_t *);
+ decoder_node_t *);
void build_decoder_tree(t_nrPolar_params *pp);
-void build_polar_tables(t_nrPolar_paramsPtr polarParams);
+void build_polar_tables(t_nrPolar_params *polarParams);
void init_polar_deinterleaver_table(t_nrPolar_params *polarParams);
-void nr_polar_init(t_nrPolar_paramsPtr *polarParams,
- int8_t messageType,
- uint16_t messageLength,
- uint8_t aggregation_level);
+void nr_polar_print_polarParams(t_nrPolar_params *polarParams);
-void nr_polar_print_polarParams(t_nrPolar_paramsPtr polarParams);
-
-t_nrPolar_paramsPtr nr_polar_params (t_nrPolar_paramsPtr polarParams,
- int8_t messageType,
- uint16_t messageLength,
- uint8_t aggregation_level);
+t_nrPolar_params *nr_polar_params ( int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level);
-uint8_t** nr_polar_kronecker_power_matrices(uint8_t n);
+uint8_t **nr_polar_kronecker_power_matrices(uint8_t n);
-const uint16_t* nr_polar_sequence_pattern(uint8_t n);
+const uint16_t *nr_polar_sequence_pattern(uint8_t n);
/*!@fn uint32_t nr_polar_output_length(uint16_t K, uint16_t E, uint8_t n_max)
* @brief Computes...
@@ -216,168 +209,168 @@ const uint16_t* nr_polar_sequence_pattern(uint8_t n);
* @param E
* @param n_max */
uint32_t nr_polar_output_length(uint16_t K,
- uint16_t E,
- uint8_t n_max);
+ uint16_t E,
+ uint8_t n_max);
void nr_polar_channel_interleaver_pattern(uint16_t *cip,
- uint8_t I_BIL,
- uint16_t E);
+ uint8_t I_BIL,
+ uint16_t E);
void nr_polar_rate_matching_pattern(uint16_t *rmp,
- uint16_t *J,
- const uint8_t *P_i_,
- uint16_t K,
- uint16_t N,
- uint16_t E);
+ uint16_t *J,
+ const uint8_t *P_i_,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E);
void nr_polar_rate_matching(double *input,
- double *output,
- uint16_t *rmp,
- uint16_t K,
- uint16_t N,
- uint16_t E);
+ double *output,
+ uint16_t *rmp,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E);
void nr_polar_rate_matching_int16(int16_t *input,
- int16_t *output,
- uint16_t *rmp,
- uint16_t K,
- uint16_t N,
- uint16_t E);
+ int16_t *output,
+ uint16_t *rmp,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E);
void nr_polar_interleaving_pattern(uint16_t K,
- uint8_t I_IL,
- uint16_t *PI_k_);
+ uint8_t I_IL,
+ uint16_t *PI_k_);
void nr_polar_info_bit_pattern(uint8_t *ibp,
- int16_t *Q_I_N,
- int16_t *Q_F_N,
- uint16_t *J,
- const uint16_t *Q_0_Nminus1,
- uint16_t K,
- uint16_t N,
- uint16_t E,
- uint8_t n_PC);
+ int16_t *Q_I_N,
+ int16_t *Q_F_N,
+ uint16_t *J,
+ const uint16_t *Q_0_Nminus1,
+ uint16_t K,
+ uint16_t N,
+ uint16_t E,
+ uint8_t n_PC);
void nr_polar_info_bit_extraction(uint8_t *input,
- uint8_t *output,
- uint8_t *pattern,
- uint16_t size);
+ uint8_t *output,
+ uint8_t *pattern,
+ uint16_t size);
void nr_bit2byte_uint32_8_t(uint32_t *in,
- uint16_t arraySize,
- uint8_t *out);
+ uint16_t arraySize,
+ uint8_t *out);
void nr_byte2bit_uint8_32_t(uint8_t *in,
- uint16_t arraySize,
- uint32_t *out);
+ uint16_t arraySize,
+ uint32_t *out);
void nr_crc_bit2bit_uint32_8_t(uint32_t *in,
- uint16_t arraySize,
- uint8_t *out);
+ uint16_t arraySize,
+ uint8_t *out);
void nr_polar_bit_insertion(uint8_t *input,
- uint8_t *output,
- uint16_t N,
- uint16_t K,
- int16_t *Q_I_N,
- int16_t *Q_PC_N,
- uint8_t n_PC);
+ uint8_t *output,
+ uint16_t N,
+ uint16_t K,
+ int16_t *Q_I_N,
+ int16_t *Q_PC_N,
+ uint8_t n_PC);
void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1,
- uint8_t **matrix2,
- uint8_t *output,
- uint16_t row,
- uint16_t col);
+ uint8_t **matrix2,
+ uint8_t *output,
+ uint16_t row,
+ uint16_t col);
uint8_t ***nr_alloc_uint8_3D_array(uint16_t xlen,
- uint16_t ylen,
- uint16_t zlen);
+ uint16_t ylen,
+ uint16_t zlen);
uint8_t **nr_alloc_uint8_2D_array(uint16_t xlen,
- uint16_t ylen);
+ uint16_t ylen);
double ***nr_alloc_double_3D_array(uint16_t xlen,
- uint16_t ylen,
- uint16_t zlen);
+ uint16_t ylen,
+ uint16_t zlen);
double **nr_alloc_double_2D_array(uint16_t xlen,
- uint16_t ylen);
+ uint16_t ylen);
void nr_free_double_3D_array(double ***input,
- uint16_t xlen,
- uint16_t ylen);
+ uint16_t xlen,
+ uint16_t ylen);
void nr_free_double_2D_array(double **input,
- uint16_t xlen);
+ uint16_t xlen);
void nr_free_uint8_3D_array(uint8_t ***input,
- uint16_t xlen,
- uint16_t ylen);
+ uint16_t xlen,
+ uint16_t ylen);
void nr_free_uint8_2D_array(uint8_t **input,
- uint16_t xlen);
+ uint16_t xlen);
void nr_sort_asc_double_1D_array_ind(double *matrix,
- uint8_t *ind,
- uint8_t len);
+ uint8_t *ind,
+ uint8_t len);
void nr_sort_asc_int16_1D_array_ind(int32_t *matrix,
- int *ind,
- int len);
+ int *ind,
+ int len);
void nr_free_double_2D_array(double **input, uint16_t xlen);
void updateLLR(double ***llr,
- uint8_t **llrU,
- uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen,
- uint8_t approximation);
+ uint8_t **llrU,
+ uint8_t ***bit,
+ uint8_t **bitU,
+ uint8_t listSize,
+ uint16_t row,
+ uint16_t col,
+ uint16_t xlen,
+ uint8_t ylen,
+ uint8_t approximation);
void updateBit(uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen);
+ uint8_t **bitU,
+ uint8_t listSize,
+ uint16_t row,
+ uint16_t col,
+ uint16_t xlen,
+ uint8_t ylen);
void updatePathMetric(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint8_t bitValue,
- uint16_t row,
- uint8_t approximation);
+ double ***llr,
+ uint8_t listSize,
+ uint8_t bitValue,
+ uint16_t row,
+ uint8_t approximation);
void updatePathMetric2(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint16_t row,
- uint8_t approximation);
+ double ***llr,
+ uint8_t listSize,
+ uint16_t row,
+ uint8_t approximation);
void computeLLR(double ***llr,
- uint16_t row,
- uint16_t col,
- uint8_t i,
- uint16_t offset,
- uint8_t approximation);
+ uint16_t row,
+ uint16_t col,
+ uint8_t i,
+ uint16_t offset,
+ uint8_t approximation);
void updateCrcChecksum(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len);
+ uint8_t **crcGen,
+ uint8_t listSize,
+ uint32_t i2,
+ uint8_t len);
void updateCrcChecksum2(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len);
+ uint8_t **crcGen,
+ uint8_t listSize,
+ uint32_t i2,
+ uint8_t len);
uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits);
@@ -387,18 +380,16 @@ uint8_t **crc6_generator_matrix(uint16_t payloadSizeBits);
//Also nr_polar_rate_matcher
static inline void nr_polar_interleaver(uint8_t *input,
- uint8_t *output,
- uint16_t *pattern,
- uint16_t size)
-{
+ uint8_t *output,
+ uint16_t *pattern,
+ uint16_t size) {
for (int i=0; iidx == 0){//PBCH
+ uint32_t *out,
+ t_nrPolar_params *polarParams) {
+ if (polarParams->idx == 0) { //PBCH
/*
uint64_t B = (((uint64_t)*in)&((((uint64_t)1)<<32)-1)) | (((uint64_t)crc24c((uint8_t*)in,polarParams->payloadBits)>>8)<payloadBits);
-#ifdef DEBUG_POLAR_ENCODER
+ #ifdef DEBUG_POLAR_ENCODER
printf("polar_B %llx (crc %x)\n",B,crc24c((uint8_t*)in,polarParams->payloadBits)>>8);
-#endif
-nr_bit2byte_uint32_8_t((uint32_t*)&B, polarParams->K, polarParams->nr_polar_B);*/
-
- nr_bit2byte_uint32_8_t((uint32_t*)in, polarParams->payloadBits, polarParams->nr_polar_A);
+ #endif
+ nr_bit2byte_uint32_8_t((uint32_t*)&B, polarParams->K, polarParams->nr_polar_B);*/
+ nr_bit2byte_uint32_8_t((uint32_t *)in, polarParams->payloadBits, polarParams->nr_polar_A);
/*
* Bytewise operations
*/
//Calculate CRC.
-
- nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_A,
- polarParams->crc_generator_matrix,
- polarParams->nr_polar_crc,
- polarParams->payloadBits,
- polarParams->crcParityBits);
- for (uint8_t i = 0; i < polarParams->crcParityBits; i++)
- polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
-
-
- //Attach CRC to the Transport Block. (a to b)
- for (uint16_t i = 0; i < polarParams->payloadBits; i++)
- polarParams->nr_polar_B[i] = polarParams->nr_polar_A[i];
- for (uint16_t i = polarParams->payloadBits; i < polarParams->K; i++)
- polarParams->nr_polar_B[i]= polarParams->nr_polar_crc[i-(polarParams->payloadBits)];
-
+ nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_A,
+ polarParams->crc_generator_matrix,
+ polarParams->nr_polar_crc,
+ polarParams->payloadBits,
+ polarParams->crcParityBits);
+
+ for (uint8_t i = 0; i < polarParams->crcParityBits; i++)
+ polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
+
+ //Attach CRC to the Transport Block. (a to b)
+ for (uint16_t i = 0; i < polarParams->payloadBits; i++)
+ polarParams->nr_polar_B[i] = polarParams->nr_polar_A[i];
+
+ for (uint16_t i = polarParams->payloadBits; i < polarParams->K; i++)
+ polarParams->nr_polar_B[i]= polarParams->nr_polar_crc[i-(polarParams->payloadBits)];
+
#ifdef DEBUG_POLAR_ENCODER
uint64_t B2=0;
- for (int i = 0;iK;i++) B2 = B2 | ((uint64_t)polarParams->nr_polar_B[i] << i);
+
+ for (int i = 0; iK; i++) B2 = B2 | ((uint64_t)polarParams->nr_polar_B[i] << i);
+
printf("polar_B %llx\n",B2);
#endif
/* for (int j=0;jcrcParityBits;j++) {
- for (int i=0;ipayloadBits;i++)
- printf("%1d.%1d+",polarParams->crc_generator_matrix[i][j],polarParams->nr_polar_A[i]);
+ for (int i=0;ipayloadBits;i++)
+ printf("%1d.%1d+",polarParams->crc_generator_matrix[i][j],polarParams->nr_polar_A[i]);
printf(" => %d\n",polarParams->nr_polar_crc[j]);
}*/
-
} else { //UCI
-
}
//Interleaving (c to c')
nr_polar_interleaver(polarParams->nr_polar_B,
- polarParams->nr_polar_CPrime,
- polarParams->interleaving_pattern,
- polarParams->K);
-
-
-#ifdef DEBUG_POLAR_ENCODER
+ polarParams->nr_polar_CPrime,
+ polarParams->interleaving_pattern,
+ polarParams->K);
+#ifdef DEBUG_POLAR_ENCODER
uint64_t Cprime=0;
- for (int i = 0;iK;i++) {
+
+ for (int i = 0; iK; i++) {
Cprime = Cprime | ((uint64_t)polarParams->nr_polar_CPrime[i] << i);
+
if (polarParams->nr_polar_CPrime[i] == 1) printf("pos %d : %llx\n",i,Cprime);
}
+
printf("polar_Cprime %llx\n",Cprime);
-#endif
+#endif
//Bit insertion (c' to u)
nr_polar_bit_insertion(polarParams->nr_polar_CPrime,
- polarParams->nr_polar_U,
- polarParams->N,
- polarParams->K,
- polarParams->Q_I_N,
- polarParams->Q_PC_N,
- polarParams->n_pc);
-
+ polarParams->nr_polar_U,
+ polarParams->N,
+ polarParams->K,
+ polarParams->Q_I_N,
+ polarParams->Q_PC_N,
+ polarParams->n_pc);
//Encoding (u to d)
/* memset(polarParams->nr_polar_U,0,polarParams->N);
polarParams->nr_polar_U[247]=1;
polarParams->nr_polar_U[253]=1;*/
nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_U,
- polarParams->G_N,
- polarParams->nr_polar_D,
- polarParams->N,
- polarParams->N);
+ polarParams->G_N,
+ polarParams->nr_polar_D,
+ polarParams->N,
+ polarParams->N);
+
for (uint16_t i = 0; i < polarParams->N; i++)
polarParams->nr_polar_D[i] = (polarParams->nr_polar_D[i] % 2);
uint64_t D[8];
- memset((void*)D,0,8*sizeof(int64_t));
+ memset((void *)D,0,8*sizeof(int64_t));
#ifdef DEBUG_POLAR_ENCODER
- for (int i=0;iN;i++) D[i/64] |= ((uint64_t)polarParams->nr_polar_D[i])<<(i&63);
- printf("D %llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",
- D[0],D[1],D[2],D[3],D[4],D[5],D[6],D[7]);
-#endif
+ for (int i=0; iN; i++) D[i/64] |= ((uint64_t)polarParams->nr_polar_D[i])<<(i&63);
+
+ printf("D %llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",
+ D[0],D[1],D[2],D[3],D[4],D[5],D[6],D[7]);
+#endif
//Rate matching
//Sub-block interleaving (d to y) and Bit selection (y to e)
nr_polar_interleaver(polarParams->nr_polar_D,
- polarParams->nr_polar_E,
- polarParams->rate_matching_pattern,
- polarParams->encoderLength);
-
+ polarParams->nr_polar_E,
+ polarParams->rate_matching_pattern,
+ polarParams->encoderLength);
/*
* Return bits.
*/
#ifdef DEBUG_POLAR_ENCODER
- for (int i=0; i< polarParams->encoderLength;i++) printf("f[%d]=%d\n", i, polarParams->nr_polar_E[i]);
-#endif
+ for (int i=0; i< polarParams->encoderLength; i++) printf("f[%d]=%d\n", i, polarParams->nr_polar_E[i]);
+
+#endif
nr_byte2bit_uint8_32_t(polarParams->nr_polar_E, polarParams->encoderLength, out);
}
void polar_encoder_dci(uint32_t *in,
- uint32_t *out,
- t_nrPolar_paramsPtr polarParams,
- uint16_t n_RNTI)
-{
+ uint32_t *out,
+ t_nrPolar_params *polarParams,
+ uint16_t n_RNTI) {
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] in: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n", in[0], in[1], in[2], in[3]);
#endif
-
/*
* Bytewise operations
*/
//(a to a')
nr_bit2byte_uint32_8_t(in, polarParams->payloadBits, polarParams->nr_polar_A);
+
for (int i=0; icrcParityBits; i++) polarParams->nr_polar_APrime[i]=1;
+
for (int i=0; ipayloadBits; i++) polarParams->nr_polar_APrime[i+(polarParams->crcParityBits)]=polarParams->nr_polar_A[i];
+
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] A: ");
+
for (int i=0; ipayloadBits; i++) printf("%d-", polarParams->nr_polar_A[i]);
+
printf("\n");
printf("[polar_encoder_dci] APrime: ");
+
for (int i=0; iK; i++) printf("%d-", polarParams->nr_polar_APrime[i]);
+
printf("\n");
printf("[polar_encoder_dci] GP: ");
+
for (int i=0; icrcParityBits; i++) printf("%d-", polarParams->crc_generator_matrix[0][i]);
+
printf("\n");
#endif
//Calculate CRC.
nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_APrime,
- polarParams->crc_generator_matrix,
- polarParams->nr_polar_crc,
- polarParams->K,
- polarParams->crcParityBits);
+ polarParams->crc_generator_matrix,
+ polarParams->nr_polar_crc,
+ polarParams->K,
+ polarParams->crcParityBits);
+
for (uint8_t i = 0; i < polarParams->crcParityBits; i++) polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
+
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] CRC: ");
+
for (int i=0; icrcParityBits; i++) printf("%d-", polarParams->nr_polar_crc[i]);
+
printf("\n");
#endif
//Attach CRC to the Transport Block. (a to b)
for (uint16_t i = 0; i < polarParams->payloadBits; i++)
polarParams->nr_polar_B[i] = polarParams->nr_polar_A[i];
+
for (uint16_t i = polarParams->payloadBits; i < polarParams->K; i++)
polarParams->nr_polar_B[i]= polarParams->nr_polar_crc[i-(polarParams->payloadBits)];
+
//Scrambling (b to c)
for (int i=0; i<16; i++) {
polarParams->nr_polar_B[polarParams->payloadBits+8+i] =
( polarParams->nr_polar_B[polarParams->payloadBits+8+i] + ((n_RNTI>>(15-i))&1) ) % 2;
}
- /* //(a to a')
- nr_crc_bit2bit_uint32_8_t(in, polarParams->payloadBits, polarParams->nr_polar_aPrime);
- //Parity bits computation (p)
- polarParams->crcBit = crc24c(polarParams->nr_polar_aPrime, (polarParams->payloadBits+polarParams->crcParityBits));
- #ifdef DEBUG_POLAR_ENCODER_DCI
- printf("[polar_encoder_dci] crc: 0x%08x\n", polarParams->crcBit);
- for (int i=0; i<32; i++)
- {
- printf("%d\n",((polarParams->crcBit)>>i)&1);
- }
- #endif
- //(a to b)
- //
- // Bytewise operations
- //
- uint8_t arrayInd = ceil(polarParams->payloadBits / 8.0);
- for (int i=0; inr_polar_B[j+(i*8)] = ((polarParams->nr_polar_aPrime[3+i]>>(7-j)) & 1);
- }
- }
- for (int i=0; i<((polarParams->payloadBits)%8); i++) {
- polarParams->nr_polar_B[i+(arrayInd-1)*8] = ((polarParams->nr_polar_aPrime[3+(arrayInd-1)]>>(7-i)) & 1);
- }
- for (int i=0; i<8; i++) {
- polarParams->nr_polar_B[polarParams->payloadBits+i] = ((polarParams->crcBit)>>(31-i))&1;
- }
- //Scrambling (b to c)
- for (int i=0; i<16; i++) {
- polarParams->nr_polar_B[polarParams->payloadBits+8+i] =
- ( (((polarParams->crcBit)>>(23-i))&1) + ((n_RNTI>>(15-i))&1) ) % 2;
- }*/
+ /* //(a to a')
+ nr_crc_bit2bit_uint32_8_t(in, polarParams->payloadBits, polarParams->nr_polar_aPrime);
+ //Parity bits computation (p)
+ polarParams->crcBit = crc24c(polarParams->nr_polar_aPrime, (polarParams->payloadBits+polarParams->crcParityBits));
+ #ifdef DEBUG_POLAR_ENCODER_DCI
+ printf("[polar_encoder_dci] crc: 0x%08x\n", polarParams->crcBit);
+ for (int i=0; i<32; i++)
+ {
+ printf("%d\n",((polarParams->crcBit)>>i)&1);
+ }
+ #endif
+ //(a to b)
+ //
+ // Bytewise operations
+ //
+ uint8_t arrayInd = ceil(polarParams->payloadBits / 8.0);
+ for (int i=0; inr_polar_B[j+(i*8)] = ((polarParams->nr_polar_aPrime[3+i]>>(7-j)) & 1);
+ }
+ }
+ for (int i=0; i<((polarParams->payloadBits)%8); i++) {
+ polarParams->nr_polar_B[i+(arrayInd-1)*8] = ((polarParams->nr_polar_aPrime[3+(arrayInd-1)]>>(7-i)) & 1);
+ }
+ for (int i=0; i<8; i++) {
+ polarParams->nr_polar_B[polarParams->payloadBits+i] = ((polarParams->crcBit)>>(31-i))&1;
+ }
+ //Scrambling (b to c)
+ for (int i=0; i<16; i++) {
+ polarParams->nr_polar_B[polarParams->payloadBits+8+i] =
+ ( (((polarParams->crcBit)>>(23-i))&1) + ((n_RNTI>>(15-i))&1) ) % 2;
+ }*/
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] B: ");
+
for (int i = 0; i < polarParams->K; i++) printf("%d-", polarParams->nr_polar_B[i]);
+
printf("\n");
#endif
-
//Interleaving (c to c')
nr_polar_interleaver(polarParams->nr_polar_B,
- polarParams->nr_polar_CPrime,
- polarParams->interleaving_pattern,
- polarParams->K);
-
+ polarParams->nr_polar_CPrime,
+ polarParams->interleaving_pattern,
+ polarParams->K);
//Bit insertion (c' to u)
nr_polar_bit_insertion(polarParams->nr_polar_CPrime,
- polarParams->nr_polar_U,
- polarParams->N,
- polarParams->K,
- polarParams->Q_I_N,
- polarParams->Q_PC_N,
- polarParams->n_pc);
-
+ polarParams->nr_polar_U,
+ polarParams->N,
+ polarParams->K,
+ polarParams->Q_I_N,
+ polarParams->Q_PC_N,
+ polarParams->n_pc);
//Encoding (u to d)
nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_U,
- polarParams->G_N,
- polarParams->nr_polar_D,
- polarParams->N,
- polarParams->N);
+ polarParams->G_N,
+ polarParams->nr_polar_D,
+ polarParams->N,
+ polarParams->N);
+
for (uint16_t i = 0; i < polarParams->N; i++)
polarParams->nr_polar_D[i] = (polarParams->nr_polar_D[i] % 2);
//Rate matching
//Sub-block interleaving (d to y) and Bit selection (y to e)
nr_polar_interleaver(polarParams->nr_polar_D,
- polarParams->nr_polar_E,
- polarParams->rate_matching_pattern,
- polarParams->encoderLength);
-
+ polarParams->nr_polar_E,
+ polarParams->rate_matching_pattern,
+ polarParams->encoderLength);
/*
* Return bits.
*/
nr_byte2bit_uint8_32_t(polarParams->nr_polar_E, polarParams->encoderLength, out);
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] E: ");
+
for (int i = 0; i < polarParams->encoderLength; i++) printf("%d-", polarParams->nr_polar_E[i]);
+
uint8_t outputInd = ceil(polarParams->encoderLength / 32.0);
printf("\n[polar_encoder_dci] out: ");
+
for (int i = 0; i < outputInd; i++) {
printf("[%d]->0x%08x\t", i, out[i]);
}
+
#endif
}
-static inline void polar_rate_matching(t_nrPolar_paramsPtr polarParams,void *in,void *out) __attribute__((always_inline));
+static inline void polar_rate_matching(t_nrPolar_params *polarParams,void *in,void *out) __attribute__((always_inline));
-static inline void polar_rate_matching(t_nrPolar_paramsPtr polarParams,void *in,void *out) {
-
- if (polarParams->groupsize == 8)
- for (int i=0;iencoderLength>>3;i++) ((uint8_t*)out)[i] = ((uint8_t *)in)[polarParams->rm_tab[i]];
+static inline void polar_rate_matching(t_nrPolar_params *polarParams,void *in,void *out) {
+ if (polarParams->groupsize == 8)
+ for (int i=0; iencoderLength>>3; i++) ((uint8_t *)out)[i] = ((uint8_t *)in)[polarParams->rm_tab[i]];
else
- for (int i=0;iencoderLength>>4;i++) {
- ((uint16_t*)out)[i] = ((uint16_t *)in)[polarParams->rm_tab[i]];
+ for (int i=0; iencoderLength>>4; i++) {
+ ((uint16_t *)out)[i] = ((uint16_t *)in)[polarParams->rm_tab[i]];
}
}
-void build_polar_tables(t_nrPolar_paramsPtr polarParams) {
-
+void build_polar_tables(t_nrPolar_params *polarParams) {
// build table b -> c'
-
AssertFatal(polarParams->K > 32, "K = %d < 33, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->K < 129, "K = %d > 64, is not supported yet\n",polarParams->K);
-
int bit_i,ip;
-
int numbytes = polarParams->K>>3;
int residue = polarParams->K&7;
int numbits;
+
if (residue>0) numbytes++;
- for (int byte=0;byteK>>3)) numbits=8;
else numbits=residue;
- for (int val=0;val<256;val++) {
+
+ for (int val=0; val<256; val++) {
polarParams->cprime_tab0[byte][val] = 0;
polarParams->cprime_tab1[byte][val] = 0;
- for (int i=0;ideinterleaving_pattern[polarParams->K-1-((8*byte)+i)];
- AssertFatal(ip<128,"ip = %d\n",ip);
- bit_i=(val>>i)&1;
- if (ip<64) polarParams->cprime_tab0[byte][val] |= (((uint64_t)bit_i)<cprime_tab1[byte][val] |= (((uint64_t)bit_i)<<(ip&63));
+
+ for (int i=0; ideinterleaving_pattern[polarParams->K-1-((8*byte)+i)];
+ AssertFatal(ip<128,"ip = %d\n",ip);
+ bit_i=(val>>i)&1;
+
+ if (ip<64) polarParams->cprime_tab0[byte][val] |= (((uint64_t)bit_i)<cprime_tab1[byte][val] |= (((uint64_t)bit_i)<<(ip&63));
}
}
}
AssertFatal(polarParams->N==512,"N = %d, not done yet\n",polarParams->N);
-
// build G bit vectors for information bit positions and convert the bit as bytes tables in nr_polar_kronecker_power_matrices.c to 64 bit packed vectors.
// keep only rows of G which correspond to information/crc bits
- polarParams->G_N_tab = (uint64_t**)malloc(polarParams->K * sizeof(int64_t*));
+ polarParams->G_N_tab = (uint64_t **)malloc(polarParams->K * sizeof(int64_t *));
int k=0;
- for (int i=0;iN;i++) {
+
+ for (int i=0; iN; i++) {
if (polarParams->information_bit_pattern[i] > 0) {
- polarParams->G_N_tab[k] = (uint64_t*)memalign(32,(polarParams->N/64)*sizeof(uint64_t));
- memset((void*)polarParams->G_N_tab[k],0,(polarParams->N/64)*sizeof(uint64_t));
- for (int j=0;jN;j++)
- polarParams->G_N_tab[k][j/64] |= ((uint64_t)polarParams->G_N[i][j])<<(j&63);
+ polarParams->G_N_tab[k] = (uint64_t *)memalign(32,(polarParams->N/64)*sizeof(uint64_t));
+ memset((void *)polarParams->G_N_tab[k],0,(polarParams->N/64)*sizeof(uint64_t));
+
+ for (int j=0; jN; j++)
+ polarParams->G_N_tab[k][j/64] |= ((uint64_t)polarParams->G_N[i][j])<<(j&63);
+
#ifdef DEBUG_POLAR_ENCODER
printf("Bit %d Selecting row %d of G : ",k,i);
- for (int j=0;jN;j+=4) printf("%1x",polarParams->G_N[i][j]+(polarParams->G_N[i][j+1]*2)+(polarParams->G_N[i][j+2]*4)+(polarParams->G_N[i][j+3]*8));
+
+ for (int j=0; jN; j+=4) printf("%1x",polarParams->G_N[i][j]+(polarParams->G_N[i][j+1]*2)+(polarParams->G_N[i][j+2]*4)+(polarParams->G_N[i][j+3]*8));
+
printf("\n");
#endif
k++;
@@ -354,56 +374,57 @@ void build_polar_tables(t_nrPolar_paramsPtr polarParams) {
int firstingroup_out=0;
int firstingroup_in=iplast;
int mingroupsize = 1024;
+
// compute minimum group size of rate-matching pattern
for (int outpos=1; outposencoderLength; outpos++) {
-
ip=polarParams->rate_matching_pattern[outpos];
+
if ((ip - iplast) == 1) ccnt++;
else {
groupcnt++;
#ifdef DEBUG_POLAR_ENCODER
printf("group %d (size %d): (%d:%d) => (%d:%d)\n",groupcnt,ccnt+1,
- firstingroup_in,firstingroup_in+ccnt,
- firstingroup_out,firstingroup_out+ccnt);
+ firstingroup_in,firstingroup_in+ccnt,
+ firstingroup_out,firstingroup_out+ccnt);
#endif
+
if ((ccnt+1)groupsize=mingroupsize;
int shift=3;
+
if (mingroupsize == 16) shift=4;
- polarParams->rm_tab=(int*)malloc(sizeof(int)*polarParams->encoderLength/mingroupsize);
+
+ polarParams->rm_tab=(int *)malloc(sizeof(int)*polarParams->encoderLength/mingroupsize);
// rerun again to create groups
int tcnt=0;
- for (int outpos=0;outposencoderLength; outpos+=mingroupsize,tcnt++)
+
+ for (int outpos=0; outposencoderLength; outpos+=mingroupsize,tcnt++)
polarParams->rm_tab[tcnt] = polarParams->rate_matching_pattern[outpos]>>shift;
-
}
void polar_encoder_fast(uint64_t *A,
- uint32_t *out,
- int32_t crcmask,
- t_nrPolar_paramsPtr polarParams) {
-
+ uint32_t *out,
+ int32_t crcmask,
+ t_nrPolar_params *polarParams) {
AssertFatal(polarParams->K > 32, "K = %d < 33, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->K < 129, "K = %d > 128, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->payloadBits < 65, "payload bits = %d > 64, is not supported yet\n",polarParams->payloadBits);
-
- uint64_t B[4]={0,0,0,0},Cprime[4]={0,0,0,0};
+ uint64_t B[4]= {0,0,0,0},Cprime[4]= {0,0,0,0};
int bitlen = polarParams->payloadBits;
-
// append crc
-
AssertFatal(bitlen<129,"support for payloads <= 128 bits\n");
AssertFatal(polarParams->crcParityBits == 24,"support for 24-bit crc only for now\n");
-
//int bitlen0=bitlen;
-
uint64_t tcrc=0;
// A bitstring should be stored as a_{N-1} a_{N-2} ... a_{N-A} 0 .... 0, where N=64,128,192,..., N is smallest multiple of 64 greater than or equal to A
@@ -413,41 +434,41 @@ void polar_encoder_fast(uint64_t *A,
if (bitlen<=32) {
uint8_t A32_flip[4];
uint32_t Aprime= (uint32_t)(((uint32_t)*A)<<(32-bitlen));
- A32_flip[0]=((uint8_t*)&Aprime)[3];
- A32_flip[1]=((uint8_t*)&Aprime)[2];
- A32_flip[2]=((uint8_t*)&Aprime)[1];
- A32_flip[3]=((uint8_t*)&Aprime)[0];
+ A32_flip[0]=((uint8_t *)&Aprime)[3];
+ A32_flip[1]=((uint8_t *)&Aprime)[2];
+ A32_flip[2]=((uint8_t *)&Aprime)[1];
+ A32_flip[3]=((uint8_t *)&Aprime)[0];
tcrc = (uint64_t)((crcmask^(crc24c(A32_flip,bitlen)>>8)));
- }
- else if (bitlen<=64) {
+ } else if (bitlen<=64) {
uint8_t A64_flip[8];
uint64_t Aprime= (uint32_t)(((uint64_t)*A)<<(64-bitlen));
- A64_flip[0]=((uint8_t*)&Aprime)[7];
- A64_flip[1]=((uint8_t*)&Aprime)[6];
- A64_flip[2]=((uint8_t*)&Aprime)[5];
- A64_flip[3]=((uint8_t*)&Aprime)[4];
- A64_flip[4]=((uint8_t*)&Aprime)[3];
- A64_flip[5]=((uint8_t*)&Aprime)[2];
- A64_flip[6]=((uint8_t*)&Aprime)[1];
- A64_flip[7]=((uint8_t*)&Aprime)[0];
+ A64_flip[0]=((uint8_t *)&Aprime)[7];
+ A64_flip[1]=((uint8_t *)&Aprime)[6];
+ A64_flip[2]=((uint8_t *)&Aprime)[5];
+ A64_flip[3]=((uint8_t *)&Aprime)[4];
+ A64_flip[4]=((uint8_t *)&Aprime)[3];
+ A64_flip[5]=((uint8_t *)&Aprime)[2];
+ A64_flip[6]=((uint8_t *)&Aprime)[1];
+ A64_flip[7]=((uint8_t *)&Aprime)[0];
tcrc = (uint64_t)((crcmask^(crc24c(A64_flip,bitlen)>>8)));
}
int n;
// this is number of quadwords in the bit string
int quadwlen = (polarParams->K>>6);
+
if ((polarParams->K&63) > 0) quadwlen++;
// Create the B bitstring as
// b_{N'-1} b_{N'-2} ... b_{N'-A} b_{N'-A-1} ... b_{N'-A-Nparity} = a_{N-1} a_{N-2} ... a_{N-A} p_{N_parity-1} ... p_0
- for (n=0;ncrcParityBits) | tcrc;
- else B[n] = (A[n] << polarParams->crcParityBits) | (A[n-1]>>(64-polarParams->crcParityBits));
-
-
- uint8_t *Bbyte = (uint8_t*)B;
+ for (n=0; ncrcParityBits) | tcrc;
+ else B[n] = (A[n] << polarParams->crcParityBits) | (A[n-1]>>(64-polarParams->crcParityBits));
+
+ uint8_t *Bbyte = (uint8_t *)B;
+
// for each byte of B, lookup in corresponding table for 64-bit word corresponding to that byte and its position
- if (polarParams->K<65)
+ if (polarParams->K<65)
Cprime[0] = polarParams->cprime_tab0[0][Bbyte[0]] |
polarParams->cprime_tab0[1][Bbyte[1]] |
polarParams->cprime_tab0[2][Bbyte[2]] |
@@ -456,82 +477,81 @@ void polar_encoder_fast(uint64_t *A,
polarParams->cprime_tab0[5][Bbyte[5]] |
polarParams->cprime_tab0[6][Bbyte[6]] |
polarParams->cprime_tab0[7][Bbyte[7]];
-
else if (polarParams->K < 129) {
- for (int i=0;i<1+(polarParams->K/8);i++) {
+ for (int i=0; i<1+(polarParams->K/8); i++) {
Cprime[0] |= polarParams->cprime_tab0[i][Bbyte[i]];
Cprime[1] |= polarParams->cprime_tab1[i][Bbyte[i]];
}
}
#ifdef DEBUG_POLAR_ENCODER
- if (polarParams->K<65)
+
+ if (polarParams->K<65)
printf("A %llx B %llx Cprime %llx (payload bits %d,crc %x)\n",
- (unsigned long long)(A[0]&(((uint64_t)1<payloadBits,
- tcrc);
+ (unsigned long long)(A[0]&(((uint64_t)1<payloadBits,
+ tcrc);
else if (polarParams->K<129) {
if (bitlen<64)
printf("A %llx B %llx|%llx Cprime %llx|%llx (payload bits %d,crc %x)\n",
- (unsigned long long)(A[0]&(((uint64_t)1<payloadBits,
- tcrc);
- else
+ (unsigned long long)(A[0]&(((uint64_t)1<payloadBits,
+ tcrc);
+ else
printf("A %llx|%llx B %llx|%llx Cprime %llx|%llx (payload bits %d,crc %x)\n",
- (unsigned long long)(A[1]&(((uint64_t)1<<(bitlen-64))-1)),(unsigned long long)(A[0]),
- (unsigned long long)(B[1]),(unsigned long long)(B[0]),
- (unsigned long long)(Cprime[1]),(unsigned long long)(Cprime[0]),
- polarParams->payloadBits,
- crc24c((uint8_t*)A,bitlen)>>8);
+ (unsigned long long)(A[1]&(((uint64_t)1<<(bitlen-64))-1)),(unsigned long long)(A[0]),
+ (unsigned long long)(B[1]),(unsigned long long)(B[0]),
+ (unsigned long long)(Cprime[1]),(unsigned long long)(Cprime[0]),
+ polarParams->payloadBits,
+ crc24c((uint8_t *)A,bitlen)>>8);
}
+
#endif
/* printf("Bbytes : %x.%x.%x.%x.%x.%x.%x.%x\n",Bbyte[0],Bbyte[1],Bbyte[2],Bbyte[3],Bbyte[4],Bbyte[5],Bbyte[6],Bbyte[7]);
- printf("%llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",polarParams->cprime_tab[0][Bbyte[0]] ,
- polarParams->cprime_tab[1][Bbyte[1]] ,
- polarParams->cprime_tab[2][Bbyte[2]] ,
- polarParams->cprime_tab[3][Bbyte[3]] ,
- polarParams->cprime_tab[4][Bbyte[4]] ,
- polarParams->cprime_tab[5][Bbyte[5]] ,
- polarParams->cprime_tab[6][Bbyte[6]] ,
- polarParams->cprime_tab[7][Bbyte[7]]);*/
-
+ printf("%llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",polarParams->cprime_tab[0][Bbyte[0]] ,
+ polarParams->cprime_tab[1][Bbyte[1]] ,
+ polarParams->cprime_tab[2][Bbyte[2]] ,
+ polarParams->cprime_tab[3][Bbyte[3]] ,
+ polarParams->cprime_tab[4][Bbyte[4]] ,
+ polarParams->cprime_tab[5][Bbyte[5]] ,
+ polarParams->cprime_tab[6][Bbyte[6]] ,
+ polarParams->cprime_tab[7][Bbyte[7]]);*/
// now do Gu product (here using 64-bit XORs, we can also do with SIMD after)
// here we're reading out the bits LSB -> MSB, is this correct w.r.t. 3GPP ?
-
uint64_t Cprime_i;
/* printf("%llx Cprime_0 (%llx) G %llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",Cprime_i,Cprime &1,
- polarParams->G_N_tab[0][0],
- polarParams->G_N_tab[0][1],
- polarParams->G_N_tab[0][2],
- polarParams->G_N_tab[0][3],
- polarParams->G_N_tab[0][4],
- polarParams->G_N_tab[0][5],
- polarParams->G_N_tab[0][6],
- polarParams->G_N_tab[0][7]);*/
- uint64_t D[8]={0,0,0,0,0,0,0,0};
+ polarParams->G_N_tab[0][0],
+ polarParams->G_N_tab[0][1],
+ polarParams->G_N_tab[0][2],
+ polarParams->G_N_tab[0][3],
+ polarParams->G_N_tab[0][4],
+ polarParams->G_N_tab[0][5],
+ polarParams->G_N_tab[0][6],
+ polarParams->G_N_tab[0][7]);*/
+ uint64_t D[8]= {0,0,0,0,0,0,0,0};
int off=0;
int len=polarParams->K;
- for (int j=0;j<(1+(polarParams->K>>6));j++,off+=64,len-=64) {
- for (int i=0;i<((len>63) ? 64 : len);i++) {
+ for (int j=0; j<(1+(polarParams->K>>6)); j++,off+=64,len-=64) {
+ for (int i=0; i<((len>63) ? 64 : len); i++) {
Cprime_i = -((Cprime[j]>>i)&1); // this converts bit 0 as, 0 => 0000x00, 1 => 1111x11
/*
-#ifdef DEBUG_POLAR_ENCODER
+ #ifdef DEBUG_POLAR_ENCODER
printf("%llx Cprime_%d (%llx) G %llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",
- Cprime_i,off+i,(Cprime[j]>>i) &1,
- polarParams->G_N_tab[off+i][0],
- polarParams->G_N_tab[off+i][1],
- polarParams->G_N_tab[off+i][2],
- polarParams->G_N_tab[off+i][3],
- polarParams->G_N_tab[off+i][4],
- polarParams->G_N_tab[off+i][5],
- polarParams->G_N_tab[off+i][6],
- polarParams->G_N_tab[off+i][7]);
-#endif
+ Cprime_i,off+i,(Cprime[j]>>i) &1,
+ polarParams->G_N_tab[off+i][0],
+ polarParams->G_N_tab[off+i][1],
+ polarParams->G_N_tab[off+i][2],
+ polarParams->G_N_tab[off+i][3],
+ polarParams->G_N_tab[off+i][4],
+ polarParams->G_N_tab[off+i][5],
+ polarParams->G_N_tab[off+i][6],
+ polarParams->G_N_tab[off+i][7]);
+ #endif
*/
uint64_t *Gi=polarParams->G_N_tab[off+i];
D[0] ^= (Cprime_i & Gi[0]);
@@ -544,18 +564,17 @@ void polar_encoder_fast(uint64_t *A,
D[7] ^= (Cprime_i & Gi[7]);
}
}
+
#ifdef DEBUG_POLAR_ENCODER
printf("D %llx,%llx,%llx,%llx,%llx,%llx,%llx,%llx\n",
- D[0],
- D[1],
- D[2],
- D[3],
- D[4],
- D[5],
- D[6],
- D[7]);
+ D[0],
+ D[1],
+ D[2],
+ D[3],
+ D[4],
+ D[5],
+ D[6],
+ D[7]);
#endif
-
- polar_rate_matching(polarParams,(void*)D,(void*)out);
-
+ polar_rate_matching(polarParams,(void *)D,(void *)out);
}
diff --git a/openair1/PHY/CODING/nr_polar_init.c b/openair1/PHY/CODING/nr_polar_init.c
index 93bcdecd6e..dd0056b3b5 100644
--- a/openair1/PHY/CODING/nr_polar_init.c
+++ b/openair1/PHY/CODING/nr_polar_init.c
@@ -37,202 +37,175 @@
#include "PHY/NR_TRANSPORT/nr_dci.h"
static int intcmp(const void *p1,const void *p2) {
-
- return(*(int16_t*)p1 > *(int16_t*)p2);
+ return(*(int16_t *)p1 > *(int16_t *)p2);
}
-void nr_polar_init(t_nrPolar_paramsPtr *polarParams,
- int8_t messageType,
- uint16_t messageLength,
- uint8_t aggregation_level)
-{
- t_nrPolar_paramsPtr currentPtr = *polarParams;
- uint16_t aggregation_prime = nr_polar_aggregation_prime(aggregation_level);
+static void nr_polar_init(t_nrPolar_params * *polarParams,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level) {
+ t_nrPolar_params *currentPtr = *polarParams;
+ uint16_t aggregation_prime = nr_polar_aggregation_prime(aggregation_level);
- //Parse the list. If the node is already created, return without initialization.
- while (currentPtr != NULL) {
- //printf("currentPtr->idx %d, (%d,%d)\n",currentPtr->idx,currentPtr->payloadBits,currentPtr->encoderLength);
- if (currentPtr->idx == (messageType * messageLength * aggregation_prime)) return;
- else currentPtr = currentPtr->nextPtr;
- }
+ //Parse the list. If the node is already created, return without initialization.
+ while (currentPtr != NULL) {
+ //printf("currentPtr->idx %d, (%d,%d)\n",currentPtr->idx,currentPtr->payloadBits,currentPtr->encoderLength);
+ if (currentPtr->idx == (messageType * messageLength * aggregation_prime)) return;
+ else currentPtr = currentPtr->nextPtr;
+ }
- // printf("currentPtr %p (polarParams %p)\n",currentPtr,polarParams);
- //Else, initialize and add node to the end of the linked list.
- t_nrPolar_paramsPtr newPolarInitNode = malloc(sizeof(t_nrPolar_params));
+ // printf("currentPtr %p (polarParams %p)\n",currentPtr,polarParams);
+ //Else, initialize and add node to the end of the linked list.
+ t_nrPolar_params *newPolarInitNode = malloc(sizeof(t_nrPolar_params));
- if (newPolarInitNode != NULL) {
+ if (newPolarInitNode != NULL) {
+ newPolarInitNode->idx = (messageType * messageLength * aggregation_prime);
+ newPolarInitNode->nextPtr = NULL;
+ //printf("newPolarInitNode->idx %d, (%d,%d,%d:%d)\n",newPolarInitNode->idx,messageType,messageLength,aggregation_prime,aggregation_level);
- newPolarInitNode->idx = (messageType * messageLength * aggregation_prime);
- newPolarInitNode->nextPtr = NULL;
- //printf("newPolarInitNode->idx %d, (%d,%d,%d:%d)\n",newPolarInitNode->idx,messageType,messageLength,aggregation_prime,aggregation_level);
+ if (messageType == 0) { //PBCH
+ newPolarInitNode->n_max = NR_POLAR_PBCH_N_MAX;
+ newPolarInitNode->i_il = NR_POLAR_PBCH_I_IL;
+ newPolarInitNode->i_seg = NR_POLAR_PBCH_I_SEG;
+ newPolarInitNode->n_pc = NR_POLAR_PBCH_N_PC;
+ newPolarInitNode->n_pc_wm = NR_POLAR_PBCH_N_PC_WM;
+ newPolarInitNode->i_bil = NR_POLAR_PBCH_I_BIL;
+ newPolarInitNode->crcParityBits = NR_POLAR_PBCH_CRC_PARITY_BITS;
+ newPolarInitNode->payloadBits = NR_POLAR_PBCH_PAYLOAD_BITS;
+ newPolarInitNode->encoderLength = NR_POLAR_PBCH_E;
+ newPolarInitNode->crcCorrectionBits = NR_POLAR_PBCH_CRC_ERROR_CORRECTION_BITS;
+ newPolarInitNode->crc_generator_matrix = crc24c_generator_matrix(newPolarInitNode->payloadBits);//G_P
+ //printf("Initializing polar parameters for PBCH (K %d, E %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength);
+ } else if (messageType == 1) { //DCI
+ newPolarInitNode->n_max = NR_POLAR_DCI_N_MAX;
+ newPolarInitNode->i_il = NR_POLAR_DCI_I_IL;
+ newPolarInitNode->i_seg = NR_POLAR_DCI_I_SEG;
+ newPolarInitNode->n_pc = NR_POLAR_DCI_N_PC;
+ newPolarInitNode->n_pc_wm = NR_POLAR_DCI_N_PC_WM;
+ newPolarInitNode->i_bil = NR_POLAR_DCI_I_BIL;
+ newPolarInitNode->crcParityBits = NR_POLAR_DCI_CRC_PARITY_BITS;
+ newPolarInitNode->payloadBits = messageLength;
+ newPolarInitNode->encoderLength = aggregation_level*108;
+ newPolarInitNode->crcCorrectionBits = NR_POLAR_DCI_CRC_ERROR_CORRECTION_BITS;
+ newPolarInitNode->crc_generator_matrix=crc24c_generator_matrix(newPolarInitNode->payloadBits+newPolarInitNode->crcParityBits);//G_P
+ //printf("Initializing polar parameters for DCI (K %d, E %d, L %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength,aggregation_level);
+ } else if (messageType == -1) { //UCI
+ } else {
+ AssertFatal(1 == 0, "[nr_polar_init] Incorrect Message Type(%d)", messageType);
+ }
- if (messageType == 0) { //PBCH
- newPolarInitNode->n_max = NR_POLAR_PBCH_N_MAX;
- newPolarInitNode->i_il = NR_POLAR_PBCH_I_IL;
- newPolarInitNode->i_seg = NR_POLAR_PBCH_I_SEG;
- newPolarInitNode->n_pc = NR_POLAR_PBCH_N_PC;
- newPolarInitNode->n_pc_wm = NR_POLAR_PBCH_N_PC_WM;
- newPolarInitNode->i_bil = NR_POLAR_PBCH_I_BIL;
- newPolarInitNode->crcParityBits = NR_POLAR_PBCH_CRC_PARITY_BITS;
- newPolarInitNode->payloadBits = NR_POLAR_PBCH_PAYLOAD_BITS;
- newPolarInitNode->encoderLength = NR_POLAR_PBCH_E;
- newPolarInitNode->crcCorrectionBits = NR_POLAR_PBCH_CRC_ERROR_CORRECTION_BITS;
- newPolarInitNode->crc_generator_matrix = crc24c_generator_matrix(newPolarInitNode->payloadBits);//G_P
- //printf("Initializing polar parameters for PBCH (K %d, E %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength);
- } else if (messageType == 1) { //DCI
- newPolarInitNode->n_max = NR_POLAR_DCI_N_MAX;
- newPolarInitNode->i_il = NR_POLAR_DCI_I_IL;
- newPolarInitNode->i_seg = NR_POLAR_DCI_I_SEG;
- newPolarInitNode->n_pc = NR_POLAR_DCI_N_PC;
- newPolarInitNode->n_pc_wm = NR_POLAR_DCI_N_PC_WM;
- newPolarInitNode->i_bil = NR_POLAR_DCI_I_BIL;
- newPolarInitNode->crcParityBits = NR_POLAR_DCI_CRC_PARITY_BITS;
- newPolarInitNode->payloadBits = messageLength;
- newPolarInitNode->encoderLength = aggregation_level*108;
- newPolarInitNode->crcCorrectionBits = NR_POLAR_DCI_CRC_ERROR_CORRECTION_BITS;
- newPolarInitNode->crc_generator_matrix=crc24c_generator_matrix(newPolarInitNode->payloadBits+newPolarInitNode->crcParityBits);//G_P
- //printf("Initializing polar parameters for DCI (K %d, E %d, L %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength,aggregation_level);
- } else if (messageType == -1) { //UCI
+ newPolarInitNode->K = newPolarInitNode->payloadBits + newPolarInitNode->crcParityBits; // Number of bits to encode.
+ newPolarInitNode->N = nr_polar_output_length(newPolarInitNode->K, newPolarInitNode->encoderLength, newPolarInitNode->n_max);
+ newPolarInitNode->n = log2(newPolarInitNode->N);
+ newPolarInitNode->G_N = nr_polar_kronecker_power_matrices(newPolarInitNode->n);
+ //polar_encoder vectors:
+ newPolarInitNode->nr_polar_crc = malloc(sizeof(uint8_t) * newPolarInitNode->crcParityBits);
+ newPolarInitNode->nr_polar_aPrime = malloc(sizeof(uint8_t) * ((ceil((newPolarInitNode->payloadBits)/32.0)*4)+3));
+ newPolarInitNode->nr_polar_APrime = malloc(sizeof(uint8_t) * newPolarInitNode->K);
+ newPolarInitNode->nr_polar_D = malloc(sizeof(uint8_t) * newPolarInitNode->N);
+ newPolarInitNode->nr_polar_E = malloc(sizeof(uint8_t) * newPolarInitNode->encoderLength);
+ //Polar Coding vectors
+ newPolarInitNode->nr_polar_U = malloc(sizeof(uint8_t) * newPolarInitNode->N); //Decoder: nr_polar_uHat
+ newPolarInitNode->nr_polar_CPrime = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_cHat
+ newPolarInitNode->nr_polar_B = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_bHat
+ newPolarInitNode->nr_polar_A = malloc(sizeof(uint8_t) * newPolarInitNode->payloadBits); //Decoder: nr_polar_aHat
+ newPolarInitNode->Q_0_Nminus1 = nr_polar_sequence_pattern(newPolarInitNode->n);
+ newPolarInitNode->interleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
+ nr_polar_interleaving_pattern(newPolarInitNode->K,
+ newPolarInitNode->i_il,
+ newPolarInitNode->interleaving_pattern);
+ newPolarInitNode->deinterleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
- } else {
- AssertFatal(1 == 0, "[nr_polar_init] Incorrect Message Type(%d)", messageType);
- }
+ for (int i=0; iK; i++)
+ newPolarInitNode->deinterleaving_pattern[newPolarInitNode->interleaving_pattern[i]] = i;
- newPolarInitNode->K = newPolarInitNode->payloadBits + newPolarInitNode->crcParityBits; // Number of bits to encode.
- newPolarInitNode->N = nr_polar_output_length(newPolarInitNode->K, newPolarInitNode->encoderLength, newPolarInitNode->n_max);
- newPolarInitNode->n = log2(newPolarInitNode->N);
- newPolarInitNode->G_N = nr_polar_kronecker_power_matrices(newPolarInitNode->n);
+ newPolarInitNode->rate_matching_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
+ uint16_t *J = malloc(sizeof(uint16_t) * newPolarInitNode->N);
+ nr_polar_rate_matching_pattern(newPolarInitNode->rate_matching_pattern,
+ J,
+ nr_polar_subblock_interleaver_pattern,
+ newPolarInitNode->K,
+ newPolarInitNode->N,
+ newPolarInitNode->encoderLength);
+ newPolarInitNode->information_bit_pattern = malloc(sizeof(uint8_t) * newPolarInitNode->N);
+ newPolarInitNode->Q_I_N = malloc(sizeof(int16_t) * (newPolarInitNode->K + newPolarInitNode->n_pc));
+ newPolarInitNode->Q_F_N = malloc( sizeof(int16_t) * (newPolarInitNode->N + 1)); // Last element shows the final array index assigned a value.
+ newPolarInitNode->Q_PC_N = malloc( sizeof(int16_t) * (newPolarInitNode->n_pc));
- //polar_encoder vectors:
- newPolarInitNode->nr_polar_crc = malloc(sizeof(uint8_t) * newPolarInitNode->crcParityBits);
- newPolarInitNode->nr_polar_aPrime = malloc(sizeof(uint8_t) * ((ceil((newPolarInitNode->payloadBits)/32.0)*4)+3));
- newPolarInitNode->nr_polar_APrime = malloc(sizeof(uint8_t) * newPolarInitNode->K);
- newPolarInitNode->nr_polar_D = malloc(sizeof(uint8_t) * newPolarInitNode->N);
- newPolarInitNode->nr_polar_E = malloc(sizeof(uint8_t) * newPolarInitNode->encoderLength);
+ for (int i = 0; i <= newPolarInitNode->N; i++)
+ newPolarInitNode->Q_F_N[i] = -1; // Empty array.
- //Polar Coding vectors
- newPolarInitNode->nr_polar_U = malloc(sizeof(uint8_t) * newPolarInitNode->N); //Decoder: nr_polar_uHat
- newPolarInitNode->nr_polar_CPrime = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_cHat
- newPolarInitNode->nr_polar_B = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_bHat
- newPolarInitNode->nr_polar_A = malloc(sizeof(uint8_t) * newPolarInitNode->payloadBits); //Decoder: nr_polar_aHat
+ nr_polar_info_bit_pattern(newPolarInitNode->information_bit_pattern,
+ newPolarInitNode->Q_I_N,
+ newPolarInitNode->Q_F_N,
+ J,
+ newPolarInitNode->Q_0_Nminus1,
+ newPolarInitNode->K,
+ newPolarInitNode->N,
+ newPolarInitNode->encoderLength,
+ newPolarInitNode->n_pc);
+ // sort the Q_I_N array in ascending order (first K positions)
+ qsort((void *)newPolarInitNode->Q_I_N,newPolarInitNode->K,sizeof(int16_t),intcmp);
+ newPolarInitNode->channel_interleaver_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
+ nr_polar_channel_interleaver_pattern(newPolarInitNode->channel_interleaver_pattern,
+ newPolarInitNode->i_bil,
+ newPolarInitNode->encoderLength);
+ free(J);
+ build_decoder_tree(newPolarInitNode);
+ build_polar_tables(newPolarInitNode);
+ init_polar_deinterleaver_table(newPolarInitNode);
+ //printf("decoder tree nodes %d\n",newPolarInitNode->tree.num_nodes);
+ } else {
+ AssertFatal(1 == 0, "[nr_polar_init] New t_nrPolar_params * could not be created");
+ }
-
-
- newPolarInitNode->Q_0_Nminus1 = nr_polar_sequence_pattern(newPolarInitNode->n);
-
- newPolarInitNode->interleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
- nr_polar_interleaving_pattern(newPolarInitNode->K,
- newPolarInitNode->i_il,
- newPolarInitNode->interleaving_pattern);
-
- newPolarInitNode->deinterleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
- for (int i=0;iK;i++)
- newPolarInitNode->deinterleaving_pattern[newPolarInitNode->interleaving_pattern[i]] = i;
-
- newPolarInitNode->rate_matching_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
- uint16_t *J = malloc(sizeof(uint16_t) * newPolarInitNode->N);
- nr_polar_rate_matching_pattern(newPolarInitNode->rate_matching_pattern,
- J,
- nr_polar_subblock_interleaver_pattern,
- newPolarInitNode->K,
- newPolarInitNode->N,
- newPolarInitNode->encoderLength);
-
- newPolarInitNode->information_bit_pattern = malloc(sizeof(uint8_t) * newPolarInitNode->N);
- newPolarInitNode->Q_I_N = malloc(sizeof(int16_t) * (newPolarInitNode->K + newPolarInitNode->n_pc));
- newPolarInitNode->Q_F_N = malloc( sizeof(int16_t) * (newPolarInitNode->N + 1)); // Last element shows the final array index assigned a value.
- newPolarInitNode->Q_PC_N = malloc( sizeof(int16_t) * (newPolarInitNode->n_pc));
- for (int i = 0; i <= newPolarInitNode->N; i++)
- newPolarInitNode->Q_F_N[i] = -1; // Empty array.
- nr_polar_info_bit_pattern(newPolarInitNode->information_bit_pattern,
- newPolarInitNode->Q_I_N,
- newPolarInitNode->Q_F_N,
- J,
- newPolarInitNode->Q_0_Nminus1,
- newPolarInitNode->K,
- newPolarInitNode->N,
- newPolarInitNode->encoderLength,
- newPolarInitNode->n_pc);
- // sort the Q_I_N array in ascending order (first K positions)
- qsort((void*)newPolarInitNode->Q_I_N,newPolarInitNode->K,sizeof(int16_t),intcmp);
-
- newPolarInitNode->channel_interleaver_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
- nr_polar_channel_interleaver_pattern(newPolarInitNode->channel_interleaver_pattern,
- newPolarInitNode->i_bil,
- newPolarInitNode->encoderLength);
-
- free(J);
-
- build_decoder_tree(newPolarInitNode);
- build_polar_tables(newPolarInitNode);
- init_polar_deinterleaver_table(newPolarInitNode);
-
- //printf("decoder tree nodes %d\n",newPolarInitNode->tree.num_nodes);
-
- } else {
- AssertFatal(1 == 0, "[nr_polar_init] New t_nrPolar_paramsPtr could not be created");
- }
-
- currentPtr = *polarParams;
- //If polarParams is empty:
- if (currentPtr == NULL)
- {
- *polarParams = newPolarInitNode;
- //printf("Creating first polarParams entry index %d, %p\n",newPolarInitNode->idx,*polarParams);
- return;
- }
- //Else, add node to the end of the linked list.
- while (currentPtr->nextPtr != NULL) {
- currentPtr = currentPtr->nextPtr;
- }
- currentPtr->nextPtr= newPolarInitNode;
- printf("Adding new polarParams entry to list index %d,%p\n",
- newPolarInitNode->idx,
- currentPtr->nextPtr);
-
- return;
+ //Fixme: the list is not thread safe
+ //The defect is not critical: we always append (never delete items) and adding two times the same is fine
+ newPolarInitNode->nextPtr=*polarParams;
+ *polarParams=newPolarInitNode;
+ return;
}
-void nr_polar_print_polarParams(t_nrPolar_paramsPtr polarParams)
-{
- uint8_t i = 0;
- if (polarParams == NULL) {
- printf("polarParams is empty.\n");
- } else {
- while (polarParams != NULL){
- printf("polarParams[%d] = %d\n", i, polarParams->idx);
- polarParams = polarParams->nextPtr;
- i++;
- }
- }
- return;
+void nr_polar_print_polarParams(t_nrPolar_params *polarParams) {
+ uint8_t i = 0;
+
+ if (polarParams == NULL) {
+ printf("polarParams is empty.\n");
+ } else {
+ while (polarParams != NULL) {
+ printf("polarParams[%d] = %d\n", i, polarParams->idx);
+ polarParams = polarParams->nextPtr;
+ i++;
+ }
+ }
+
+ return;
}
-t_nrPolar_paramsPtr nr_polar_params (t_nrPolar_paramsPtr polarParams,
- int8_t messageType,
- uint16_t messageLength,
- uint8_t aggregation_level)
-{
- t_nrPolar_paramsPtr currentPtr = NULL;
+t_nrPolar_params *nr_polar_params ( int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level) {
+ static t_nrPolar_params *polarList = NULL;
+ nr_polar_init(&polarList, messageType,messageLength,aggregation_level);
+ t_nrPolar_params *polarParams=polarList;
+ const int tag=messageType * messageLength * nr_polar_aggregation_prime(aggregation_level);
- while (polarParams != NULL) {
- if (polarParams->idx ==
- (messageType * messageLength * (nr_polar_aggregation_prime(aggregation_level)) )) {
- currentPtr = polarParams;
- break;
- } else {
- polarParams = polarParams->nextPtr;
- }
- }
- return currentPtr;
+ while (polarParams != NULL) {
+ if (polarParams->idx == tag)
+ return polarParams;
+
+ polarParams = polarParams->nextPtr;
+ }
+
+ AssertFatal(false,"Polar Init tables internal failure\n");
+ return NULL;
}
-uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level)
-{
- if (aggregation_level == 0) return 0;
- else if (aggregation_level == 1) return NR_POLAR_AGGREGATION_LEVEL_1_PRIME;
- else if (aggregation_level == 2) return NR_POLAR_AGGREGATION_LEVEL_2_PRIME;
- else if (aggregation_level == 4) return NR_POLAR_AGGREGATION_LEVEL_4_PRIME;
- else if (aggregation_level == 8) return NR_POLAR_AGGREGATION_LEVEL_8_PRIME;
- else return NR_POLAR_AGGREGATION_LEVEL_16_PRIME; //aggregation_level == 16
+uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level) {
+ if (aggregation_level == 0) return 0;
+ else if (aggregation_level == 1) return NR_POLAR_AGGREGATION_LEVEL_1_PRIME;
+ else if (aggregation_level == 2) return NR_POLAR_AGGREGATION_LEVEL_2_PRIME;
+ else if (aggregation_level == 4) return NR_POLAR_AGGREGATION_LEVEL_4_PRIME;
+ else if (aggregation_level == 8) return NR_POLAR_AGGREGATION_LEVEL_8_PRIME;
+ else return NR_POLAR_AGGREGATION_LEVEL_16_PRIME; //aggregation_level == 16
}
diff --git a/openair1/PHY/CODING/nr_rate_matching.c b/openair1/PHY/CODING/nr_rate_matching.c
index 01390f1f2f..0bce31630f 100644
--- a/openair1/PHY/CODING/nr_rate_matching.c
+++ b/openair1/PHY/CODING/nr_rate_matching.c
@@ -63,55 +63,39 @@ void nr_deinterleaving_ldpc(uint32_t E, uint8_t Qm, int16_t *e,int16_t *f)
}
-uint32_t nr_rate_matching_ldpc(uint8_t Ilbrm,
- uint32_t Tbslbrm,
- uint8_t BG,
- uint16_t Z,
- uint32_t G,
- uint8_t *w,
- uint8_t *e,
- uint8_t C,
- uint8_t rvidx,
- uint8_t Qm,
- uint8_t Nl,
- uint8_t r)
+int nr_rate_matching_ldpc(uint8_t Ilbrm,
+ uint32_t Tbslbrm,
+ uint8_t BG,
+ uint16_t Z,
+ uint8_t *w,
+ uint8_t *e,
+ uint8_t C,
+ uint8_t rvidx,
+ uint32_t E)
{
- uint8_t Cprime;
- uint32_t Ncb,E,ind,k,Nref,N;
- //uint8_t *e2;
+ uint32_t Ncb,ind,k,Nref,N;
- AssertFatal(Nl>0,"Nl is 0\n");
- AssertFatal(Qm>0,"Qm is 0\n");
+ if (C==0) {
+ printf("nr_rate_matching: invalid parameters (C %d\n",C);
+ return -1;
+ }
//Bit selection
N = (BG==1)?(66*Z):(50*Z);
if (Ilbrm == 0)
- Ncb = N;
+ Ncb = N;
else {
Nref = 3*Tbslbrm/(2*C); //R_LBRM = 2/3
Ncb = min(N, Nref);
}
-#ifdef RM_DEBUG
- printf("nr_rate_matching: Ncb %d, rvidx %d, G %d, Qm %d, Nl%d, r %d\n",Ncb,rvidx, G, Qm,Nl,r);
-#endif
-
- Cprime = C; //assume CBGTI not present
-
- if (r <= Cprime - ((G/(Nl*Qm))%Cprime) - 1)
- E = Nl*Qm*(G/(Nl*Qm*Cprime));
- else
- E = Nl*Qm*((G/(Nl*Qm*Cprime))+1);
-
ind = (index_k0[BG-1][rvidx]*Ncb/N)*Z;
#ifdef RM_DEBUG
- printf("nr_rate_matching: E %d, k0 %d Cprime %d modcprime %d\n",E,ind, Cprime,((G/(Nl*Qm))%Cprime));
+ printf("nr_rate_matching_ldpc: E %d, k0 %d, Ncb %d, rvidx %d\n", E, ind, Ncb, rvidx);
#endif
- //e2 = e;
-
k=0;
for (; (ind0,"Nl is 0\n");
- AssertFatal(Qm>0,"Qm is 0\n");
-
//Bit selection
N = (BG==1)?(66*Z):(50*Z);
if (Ilbrm == 0)
- Ncb = N;
+ Ncb = N;
else {
Nref = (3*Tbslbrm/(2*C)); //R_LBRM = 2/3
Ncb = min(N, Nref);
}
- Cprime = C; //assume CBGTI not present
-
- if (r <= Cprime - ((G/(Nl*Qm))%Cprime) - 1)
- E = Nl*Qm*(G/(Nl*Qm*Cprime));
- else
- E = Nl*Qm*((G/(Nl*Qm*Cprime))+1);
-
ind = (index_k0[BG-1][rvidx]*Ncb/N)*Z;
#ifdef RM_DEBUG
- printf("nr_rate_matching_ldpc_rx: Clear %d, E %d, Ncb %d,rvidx %d, G %d, Qm %d, Nl%d, r %d\n",clear,E,Ncb,rvidx, G, Qm,Nl,r);
+ printf("nr_rate_matching_ldpc_rx: Clear %d, E %d, k0 %d, Ncb %d, rvidx %d\n", clear, E, ind, Ncb, rvidx);
#endif
if (clear==1)
memset(w,0,Ncb*sizeof(int16_t));
- soft_input2 = soft_input;
k=0;
for (; (ind
-#include "PHY/NR_REFSIG/nr_refsig.h"
+#include "PHY/NR_REFSIG/nr_refsig.h"
#include "PHY/LTE_REFSIG/lte_refsig.h"
#include "SCHED_NR/fapi_nr_l1.h"
@@ -41,104 +41,86 @@ extern uint32_t from_nrarfcn(int nr_bandP,uint32_t dl_nrarfcn);
extern int32_t get_uldl_offset(int nr_bandP);
int l1_north_init_gNB() {
-
int i,j;
- if (RC.nb_nr_L1_inst > 0 && RC.nb_nr_L1_CC != NULL && RC.gNB != NULL)
- {
+ if (RC.nb_nr_L1_inst > 0 && RC.nb_nr_L1_CC != NULL && RC.gNB != NULL) {
AssertFatal(RC.nb_nr_L1_inst>0,"nb_nr_L1_inst=%d\n",RC.nb_nr_L1_inst);
AssertFatal(RC.nb_nr_L1_CC!=NULL,"nb_nr_L1_CC is null\n");
AssertFatal(RC.gNB!=NULL,"RC.gNB is null\n");
-
LOG_I(PHY,"%s() RC.nb_nr_L1_inst:%d\n", __FUNCTION__, RC.nb_nr_L1_inst);
- for (i=0;i0,"RC.nb_nr_L1_CC[%d]=%d\n",i,RC.nb_nr_L1_CC[i]);
-
LOG_I(PHY,"%s() RC.nb_nr_L1_CC[%d]:%d\n", __FUNCTION__, i, RC.nb_nr_L1_CC[i]);
- for (j=0;jif_inst = NR_IF_Module_init(i))<0) return(-1);
+ if ((RC.gNB[i][j]->if_inst = NR_IF_Module_init(i))<0) return(-1);
LOG_I(PHY,"%s() RC.gNB[%d][%d] installing callbacks\n", __FUNCTION__, i, j);
-
RC.gNB[i][j]->if_inst->NR_PHY_config_req = nr_phy_config_request;
RC.gNB[i][j]->if_inst->NR_Schedule_response = nr_schedule_response;
}
}
- }
- else
- {
+ } else {
LOG_I(PHY,"%s() Not installing PHY callbacks - RC.nb_nr_L1_inst:%d RC.nb_nr_L1_CC:%p RC.gNB:%p\n", __FUNCTION__, RC.nb_nr_L1_inst, RC.nb_nr_L1_CC, RC.gNB);
}
+
return(0);
}
int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
- unsigned char is_secondary_gNB,
- unsigned char abstraction_flag)
-{
-
+ unsigned char is_secondary_gNB,
+ unsigned char abstraction_flag) {
// shortcuts
- NR_DL_FRAME_PARMS* const fp = &gNB->frame_parms;
- nfapi_nr_config_request_t* cfg = &gNB->gNB_config;
- NR_gNB_COMMON* const common_vars = &gNB->common_vars;
- LTE_eNB_PUSCH** const pusch_vars = gNB->pusch_vars;
- LTE_eNB_SRS* const srs_vars = gNB->srs_vars;
- LTE_eNB_PRACH* const prach_vars = &gNB->prach_vars;
-
- int i, UE_id;
-
+ NR_DL_FRAME_PARMS *const fp = &gNB->frame_parms;
+ nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
+ NR_gNB_COMMON *const common_vars = &gNB->common_vars;
+ LTE_eNB_PUSCH **const pusch_vars = gNB->pusch_vars;
+ LTE_eNB_SRS *const srs_vars = gNB->srs_vars;
+ LTE_eNB_PRACH *const prach_vars = &gNB->prach_vars;
+ int i, UE_id;
LOG_I(PHY,"[gNB %d] %s() About to wait for gNB to be configured\n", gNB->Mod_id, __FUNCTION__);
-
gNB->total_dlsch_bitrate = 0;
gNB->total_transmitted_bits = 0;
gNB->total_system_throughput = 0;
gNB->check_for_MUMIMO_transmissions=0;
-
+
while(gNB->configured == 0) usleep(10000);
init_dfts();
-/*
- LOG_I(PHY,"[gNB %"PRIu8"] Initializing DL_FRAME_PARMS : N_RB_DL %"PRIu8", PHICH Resource %d, PHICH Duration %d nb_antennas_tx:%u nb_antennas_rx:%u PRACH[rootSequenceIndex:%u prach_Config_enabled:%u configIndex:%u highSpeed:%u zeroCorrelationZoneConfig:%u freqOffset:%u]\n",
- gNB->Mod_id,
- fp->N_RB_DL,fp->phich_config_common.phich_resource,
- fp->phich_config_common.phich_duration,
- fp->nb_antennas_tx, fp->nb_antennas_rx,
- fp->prach_config_common.rootSequenceIndex,
- fp->prach_config_common.prach_Config_enabled,
- fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
- fp->prach_config_common.prach_ConfigInfo.highSpeedFlag,
- fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
- fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset
- );*/
+ /*
+ LOG_I(PHY,"[gNB %"PRIu8"] Initializing DL_FRAME_PARMS : N_RB_DL %"PRIu8", PHICH Resource %d, PHICH Duration %d nb_antennas_tx:%u nb_antennas_rx:%u PRACH[rootSequenceIndex:%u prach_Config_enabled:%u configIndex:%u highSpeed:%u zeroCorrelationZoneConfig:%u freqOffset:%u]\n",
+ gNB->Mod_id,
+ fp->N_RB_DL,fp->phich_config_common.phich_resource,
+ fp->phich_config_common.phich_duration,
+ fp->nb_antennas_tx, fp->nb_antennas_rx,
+ fp->prach_config_common.rootSequenceIndex,
+ fp->prach_config_common.prach_Config_enabled,
+ fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
+ fp->prach_config_common.prach_ConfigInfo.highSpeedFlag,
+ fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
+ fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset
+ );*/
LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_gNB][MOD %02"PRIu8"][]\n", gNB->Mod_id);
-
crcTableInit();
-
init_dfts();
-
// PBCH DMRS gold sequences generation
nr_init_pbch_dmrs(gNB);
// Polar encoder init for PBCH
-
- nr_polar_init(&gNB->nrPolar_params,
- NR_POLAR_PBCH_MESSAGE_TYPE,
- NR_POLAR_PBCH_PAYLOAD_BITS,
- NR_POLAR_PBCH_AGGREGATION_LEVEL);
-
//PDCCH DMRS init
- gNB->nr_gold_pdcch_dmrs = (uint32_t ***)malloc16(fp->slots_per_frame*sizeof(uint32_t**));
+ gNB->nr_gold_pdcch_dmrs = (uint32_t ***)malloc16(fp->slots_per_frame*sizeof(uint32_t **));
uint32_t ***pdcch_dmrs = gNB->nr_gold_pdcch_dmrs;
AssertFatal(pdcch_dmrs!=NULL, "NR init: pdcch_dmrs malloc failed\n");
+
for (int slot=0; slotslots_per_frame; slot++) {
- pdcch_dmrs[slot] = (uint32_t **)malloc16(fp->symbols_per_slot*sizeof(uint32_t*));
+ pdcch_dmrs[slot] = (uint32_t **)malloc16(fp->symbols_per_slot*sizeof(uint32_t *));
AssertFatal(pdcch_dmrs[slot]!=NULL, "NR init: pdcch_dmrs for slot %d - malloc failed\n", slot);
- for (int symb=0; symbsymbols_per_slot; symb++){
+
+ for (int symb=0; symbsymbols_per_slot; symb++) {
pdcch_dmrs[slot][symb] = (uint32_t *)malloc16(NR_MAX_PDCCH_DMRS_INIT_LENGTH_DWORD*sizeof(uint32_t));
AssertFatal(pdcch_dmrs[slot][symb]!=NULL, "NR init: pdcch_dmrs for slot %d symbol %d - malloc failed\n", slot, symb);
}
@@ -146,127 +128,115 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
nr_init_pdcch_dmrs(gNB, cfg->sch_config.physical_cell_id.value);
nr_init_pbch_interleaver(gNB->nr_pbch_interleaver);
+ //PDSCH DMRS init
+ gNB->nr_gold_pdsch_dmrs = (uint32_t ****)malloc16(fp->slots_per_frame*sizeof(uint32_t ***));
+ uint32_t ****pdsch_dmrs = gNB->nr_gold_pdsch_dmrs;
-
- //PDSCH DMRS init
- gNB->nr_gold_pdsch_dmrs = (uint32_t ****)malloc16(fp->slots_per_frame*sizeof(uint32_t***));
- uint32_t ****pdsch_dmrs = gNB->nr_gold_pdsch_dmrs;
- for (int slot=0; slotslots_per_frame; slot++) {
- pdsch_dmrs[slot] = (uint32_t ***)malloc16(fp->symbols_per_slot*sizeof(uint32_t**));
+ for (int slot=0; slotslots_per_frame; slot++) {
+ pdsch_dmrs[slot] = (uint32_t ***)malloc16(fp->symbols_per_slot*sizeof(uint32_t **));
AssertFatal(pdsch_dmrs[slot]!=NULL, "NR init: pdsch_dmrs for slot %d - malloc failed\n", slot);
- for (int symb=0; symbsymbols_per_slot; symb++){
- pdsch_dmrs[slot][symb] = (uint32_t **)malloc16(NR_MAX_NB_CODEWORDS*sizeof(uint32_t*));
+
+ for (int symb=0; symbsymbols_per_slot; symb++) {
+ pdsch_dmrs[slot][symb] = (uint32_t **)malloc16(NR_MAX_NB_CODEWORDS*sizeof(uint32_t *));
AssertFatal(pdsch_dmrs[slot][symb]!=NULL, "NR init: pdsch_dmrs for slot %d symbol %d - malloc failed\n", slot, symb);
+
for (int q=0; qsch_config.physical_cell_id.value);
+
+ nr_init_pdsch_dmrs(gNB, cfg->sch_config.physical_cell_id.value);
/// Transport init necessary for NR synchro
init_nr_transport(gNB);
-
-/*
- lte_gold(fp,gNB->lte_gold_table,fp->Nid_cell);
- generate_pcfich_reg_mapping(fp);
- generate_phich_reg_mapping(fp);*/
+
+ /*
+ lte_gold(fp,gNB->lte_gold_table,fp->Nid_cell);
+ generate_pcfich_reg_mapping(fp);
+ generate_phich_reg_mapping(fp);*/
for (UE_id=0; UE_idfirst_run_timing_advance[UE_id] =
1; ///This flag used to be static. With multiple gNBs this does no longer work, hence we put it in the structure. However it has to be initialized with 1, which is performed here.
-
// clear whole structure
bzero( &gNB->UE_stats[UE_id], sizeof(LTE_eNB_UE_stats) );
-
gNB->physicalConfigDedicated[UE_id] = NULL;
}
-
- gNB->first_run_I0_measurements = 1; ///This flag used to be static. With multiple gNBs this does no longer work, hence we put it in the structure. However it has to be initialized with 1, which is performed here.
-
+ gNB->first_run_I0_measurements =
+ 1; ///This flag used to be static. With multiple gNBs this does no longer work, hence we put it in the structure. However it has to be initialized with 1, which is performed here.
common_vars->rxdata = (int32_t **)NULL;
- common_vars->txdataF = (int32_t **)malloc16(15*sizeof(int32_t*));
- common_vars->rxdataF = (int32_t **)malloc16(64*sizeof(int32_t*));
-
- for (i=0;i<15;i++){
- common_vars->txdataF[i] = (int32_t*)malloc16_clear(fp->samples_per_frame_wCP*sizeof(int32_t) );
-
- LOG_D(PHY,"[INIT] common_vars->txdataF[%d] = %p (%lu bytes)\n",
- i,common_vars->txdataF[i],
- fp->samples_per_frame_wCP*sizeof(int32_t));
+ common_vars->txdataF = (int32_t **)malloc16(15*sizeof(int32_t *));
+ common_vars->rxdataF = (int32_t **)malloc16(64*sizeof(int32_t *));
+
+ for (i=0; i<15; i++) {
+ common_vars->txdataF[i] = (int32_t *)malloc16_clear(fp->samples_per_frame_wCP*sizeof(int32_t) );
+ LOG_D(PHY,"[INIT] common_vars->txdataF[%d] = %p (%lu bytes)\n",
+ i,common_vars->txdataF[i],
+ fp->samples_per_frame_wCP*sizeof(int32_t));
}
-
-
+
// Channel estimates for SRS
for (UE_id=0; UE_idofdm_symbol_size );
- srs_vars[UE_id].srs_ch_estimates_time[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
+ srs_vars[UE_id].srs_ch_estimates[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size );
+ srs_vars[UE_id].srs_ch_estimates_time[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
}
} //UE_id
-
/*generate_ul_ref_sigs_rx();
-
+
init_ulsch_power_LUT();*/
// SRS
for (UE_id=0; UE_idofdm_symbol_size*sizeof(int32_t));
+ srs_vars[UE_id].srs = (int32_t *)malloc16_clear(2*fp->ofdm_symbol_size*sizeof(int32_t));
}
// PRACH
- prach_vars->prachF = (int16_t*)malloc16_clear( 1024*2*sizeof(int16_t) );
-
+ prach_vars->prachF = (int16_t *)malloc16_clear( 1024*2*sizeof(int16_t) );
// assume maximum of 64 RX antennas for PRACH receiver
- prach_vars->prach_ifft[0] = (int32_t**)malloc16_clear(64*sizeof(int32_t*));
- for (i=0;i<64;i++) prach_vars->prach_ifft[0][i] = (int32_t*)malloc16_clear(1024*2*sizeof(int32_t));
+ prach_vars->prach_ifft[0] = (int32_t **)malloc16_clear(64*sizeof(int32_t *));
- prach_vars->rxsigF[0] = (int16_t**)malloc16_clear(64*sizeof(int16_t*));
+ for (i=0; i<64; i++) prach_vars->prach_ifft[0][i] = (int32_t *)malloc16_clear(1024*2*sizeof(int32_t));
+
+ prach_vars->rxsigF[0] = (int16_t **)malloc16_clear(64*sizeof(int16_t *));
for (UE_id=0; UE_idrxdataF_ext = (int32_t**)malloc16( 2*sizeof(int32_t*) );
- pusch_vars[UE_id]->rxdataF_ext2 = (int32_t**)malloc16( 2*sizeof(int32_t*) );
- pusch_vars[UE_id]->drs_ch_estimates = (int32_t**)malloc16( 2*sizeof(int32_t*) );
- pusch_vars[UE_id]->drs_ch_estimates_time = (int32_t**)malloc16( 2*sizeof(int32_t*) );
- pusch_vars[UE_id]->rxdataF_comp = (int32_t**)malloc16( 2*sizeof(int32_t*) );
- pusch_vars[UE_id]->ul_ch_mag = (int32_t**)malloc16( 2*sizeof(int32_t*) );
- pusch_vars[UE_id]->ul_ch_magb = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-
+ pusch_vars[UE_id] = (LTE_eNB_PUSCH *)malloc16_clear( NUMBER_OF_UE_MAX*sizeof(LTE_eNB_PUSCH) );
+ pusch_vars[UE_id]->rxdataF_ext = (int32_t **)malloc16( 2*sizeof(int32_t *) );
+ pusch_vars[UE_id]->rxdataF_ext2 = (int32_t **)malloc16( 2*sizeof(int32_t *) );
+ pusch_vars[UE_id]->drs_ch_estimates = (int32_t **)malloc16( 2*sizeof(int32_t *) );
+ pusch_vars[UE_id]->drs_ch_estimates_time = (int32_t **)malloc16( 2*sizeof(int32_t *) );
+ pusch_vars[UE_id]->rxdataF_comp = (int32_t **)malloc16( 2*sizeof(int32_t *) );
+ pusch_vars[UE_id]->ul_ch_mag = (int32_t **)malloc16( 2*sizeof(int32_t *) );
+ pusch_vars[UE_id]->ul_ch_magb = (int32_t **)malloc16( 2*sizeof(int32_t *) );
+
for (i=0; i<2; i++) {
// RK 2 times because of output format of FFT!
// FIXME We should get rid of this
- pusch_vars[UE_id]->rxdataF_ext[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
- pusch_vars[UE_id]->rxdataF_ext2[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
- pusch_vars[UE_id]->drs_ch_estimates[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
- pusch_vars[UE_id]->drs_ch_estimates_time[i] = (int32_t*)malloc16_clear( 2*sizeof(int32_t)*fp->ofdm_symbol_size );
- pusch_vars[UE_id]->rxdataF_comp[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
- pusch_vars[UE_id]->ul_ch_mag[i] = (int32_t*)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12 );
- pusch_vars[UE_id]->ul_ch_magb[i] = (int32_t*)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12 );
- }
-
- pusch_vars[UE_id]->llr = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
+ pusch_vars[UE_id]->rxdataF_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
+ pusch_vars[UE_id]->rxdataF_ext2[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
+ pusch_vars[UE_id]->drs_ch_estimates[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
+ pusch_vars[UE_id]->drs_ch_estimates_time[i] = (int32_t *)malloc16_clear( 2*sizeof(int32_t)*fp->ofdm_symbol_size );
+ pusch_vars[UE_id]->rxdataF_comp[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12*fp->symbols_per_slot );
+ pusch_vars[UE_id]->ul_ch_mag[i] = (int32_t *)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12 );
+ pusch_vars[UE_id]->ul_ch_magb[i] = (int32_t *)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*cfg->rf_config.ul_carrier_bandwidth.value*12 );
+ }
+
+ pusch_vars[UE_id]->llr = (int16_t *)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
} //UE_id
-
for (UE_id=0; UE_idUE_stats_ptr[UE_id] = &gNB->UE_stats[UE_id];
-
+
gNB->pdsch_config_dedicated->p_a = dB0; //defaul value until overwritten by RRCConnectionReconfiguration
-
-
return (0);
-
}
/*
void phy_config_request(PHY_Config_t *phy_config) {
@@ -277,7 +247,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
NR_DL_FRAME_PARMS *fp;
PHICH_RESOURCE_t phich_resource_table[4]={oneSixth,half,one,two};
- int eutra_band = cfg->nfapi_config.rf_bands.rf_band[0];
+ int eutra_band = cfg->nfapi_config.rf_bands.rf_band[0];
int dl_Bandwidth = cfg->rf_config.dl_carrier_bandwidth.value;
int ul_Bandwidth = cfg->rf_config.ul_carrier_bandwidth.value;
int Nid_cell = cfg->sch_config.physical_cell_id.value;
@@ -286,7 +256,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
uint32_t dl_CarrierFreq = cfg->nfapi_config.earfcn.value;
LOG_I(PHY,"Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d, N_RB_UL %d, Nid_cell %d,gNB_tx_antenna_ports %d,Ncp %d,DL freq %u)\n",
- Mod_id, CC_id, eutra_band, dl_Bandwidth, ul_Bandwidth, Nid_cell, p_eNB,Ncp,dl_CarrierFreq );
+ Mod_id, CC_id, eutra_band, dl_Bandwidth, ul_Bandwidth, Nid_cell, p_eNB,Ncp,dl_CarrierFreq );
AssertFatal(RC.gNB != NULL, "PHY instance pointer doesn't exist\n");
AssertFatal(RC.gNB[Mod_id] != NULL, "PHY instance %d doesn't exist\n",Mod_id);
@@ -312,25 +282,23 @@ void phy_config_request(PHY_Config_t *phy_config) {
}*/
-void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
-{
+void phy_free_nr_gNB(PHY_VARS_gNB *gNB) {
//NR_DL_FRAME_PARMS* const fp = &gNB->frame_parms;
//nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
- NR_gNB_COMMON* const common_vars = &gNB->common_vars;
- LTE_eNB_PUSCH** const pusch_vars = gNB->pusch_vars;
- LTE_eNB_SRS* const srs_vars = gNB->srs_vars;
- LTE_eNB_PRACH* const prach_vars = &gNB->prach_vars;
+ NR_gNB_COMMON *const common_vars = &gNB->common_vars;
+ LTE_eNB_PUSCH **const pusch_vars = gNB->pusch_vars;
+ LTE_eNB_SRS *const srs_vars = gNB->srs_vars;
+ LTE_eNB_PRACH *const prach_vars = &gNB->prach_vars;
uint32_t ***pdcch_dmrs = gNB->nr_gold_pdcch_dmrs;
-
int i, UE_id;
for (i = 0; i < 15; i++) {
free_and_zero(common_vars->txdataF[i]);
- /* rxdataF[i] is not allocated -> don't free */
+ /* rxdataF[i] is not allocated -> don't free */
}
+
free_and_zero(common_vars->txdataF);
free_and_zero(common_vars->rxdataF);
-
// PDCCH DMRS sequences
free_and_zero(pdcch_dmrs);
@@ -340,6 +308,7 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero(srs_vars[UE_id].srs_ch_estimates[i]);
free_and_zero(srs_vars[UE_id].srs_ch_estimates_time[i]);
}
+
free_and_zero(srs_vars[UE_id].srs_ch_estimates);
free_and_zero(srs_vars[UE_id].srs_ch_estimates_time);
} //UE_id
@@ -351,8 +320,8 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero(prach_vars->prachF);
for (i = 0; i < 64; i++) free_and_zero(prach_vars->prach_ifft[0][i]);
- free_and_zero(prach_vars->prach_ifft[0]);
+ free_and_zero(prach_vars->prach_ifft[0]);
free_and_zero(prach_vars->rxsigF[0]);
for (UE_id=0; UE_idul_ch_mag[i]);
free_and_zero(pusch_vars[UE_id]->ul_ch_magb[i]);
}
+
free_and_zero(pusch_vars[UE_id]->rxdataF_ext);
free_and_zero(pusch_vars[UE_id]->rxdataF_ext2);
free_and_zero(pusch_vars[UE_id]->drs_ch_estimates);
@@ -387,11 +357,11 @@ void install_schedule_handlers(IF_Module_t *if_inst)
/// this function is a temporary addition for NR configuration
-void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu,int Nid_cell,uint64_t position_in_burst)
-{
+
+void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu,int Nid_cell,uint64_t position_in_burst) {
+
NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
nfapi_nr_config_request_t *gNB_config = &gNB->gNB_config;
-
//overwrite for new NR parameters
gNB_config->nfapi_config.rf_bands.rf_band[0] = 78;
gNB_config->nfapi_config.nrarfcn.value = 620000;
@@ -407,28 +377,20 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu,
gNB_config->sch_config.ssb_scg_position_in_burst.value=position_in_burst;
gNB->mac_enabled = 1;
-
fp->dl_CarrierFreq = from_nrarfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
fp->ul_CarrierFreq = fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
fp->threequarter_fs = 0;
-
nr_init_frame_parms(gNB_config, fp);
-
gNB->configured = 1;
LOG_I(PHY,"gNB configured\n");
}
-void nr_phy_config_request(NR_PHY_Config_t *phy_config)
-{
-
+void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
uint8_t Mod_id = phy_config->Mod_id;
int CC_id = phy_config->CC_id;
-
NR_DL_FRAME_PARMS *fp = &RC.gNB[Mod_id][CC_id]->frame_parms;
nfapi_nr_config_request_t *gNB_config = &RC.gNB[Mod_id][CC_id]->gNB_config;
-
-
gNB_config->nfapi_config.rf_bands.rf_band[0] = phy_config->cfg->nfapi_config.rf_bands.rf_band[0]; //22
gNB_config->nfapi_config.nrarfcn.value = phy_config->cfg->nfapi_config.nrarfcn.value; //6600
gNB_config->subframe_config.numerology_index_mu.value = phy_config->cfg->subframe_config.numerology_index_mu.value;//1
@@ -442,77 +404,69 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
if (phy_config->cfg->subframe_config.duplex_mode.value == 0) {
gNB_config->subframe_config.duplex_mode.value = TDD;
- }
- else {
+ } else {
gNB_config->subframe_config.duplex_mode.value = FDD;
}
RC.gNB[Mod_id][CC_id]->mac_enabled = 1;
-
fp->dl_CarrierFreq = from_nrarfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
fp->ul_CarrierFreq = fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
fp->threequarter_fs = 0;
-
LOG_I(PHY,"Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d, N_RB_UL %d, Nid_cell %d,DL freq %u)\n",
- Mod_id,
- CC_id,
- gNB_config->nfapi_config.rf_bands.rf_band[0],
- gNB_config->rf_config.dl_carrier_bandwidth.value,
- gNB_config->rf_config.ul_carrier_bandwidth.value,
- gNB_config->sch_config.physical_cell_id.value,
- fp->dl_CarrierFreq );
-
+ Mod_id,
+ CC_id,
+ gNB_config->nfapi_config.rf_bands.rf_band[0],
+ gNB_config->rf_config.dl_carrier_bandwidth.value,
+ gNB_config->rf_config.ul_carrier_bandwidth.value,
+ gNB_config->sch_config.physical_cell_id.value,
+ fp->dl_CarrierFreq );
nr_init_frame_parms(gNB_config, fp);
- if (RC.gNB[Mod_id][CC_id]->configured == 1){
+ if (RC.gNB[Mod_id][CC_id]->configured == 1) {
LOG_E(PHY,"Already gNB already configured, do nothing\n");
return;
}
RC.gNB[Mod_id][CC_id]->configured = 1;
LOG_I(PHY,"gNB %d/%d configured\n",Mod_id,CC_id);
-
-
-
}
void init_nr_transport(PHY_VARS_gNB *gNB) {
-
int i;
int j;
NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
-
LOG_I(PHY, "Initialise nr transport\n");
for (i=0; idlsch[i][j] = new_gNB_dlsch(1,16,NSOFT,0,fp,cfg);
+
if (!gNB->dlsch[i][j]) {
- LOG_E(PHY,"Can't get gNB dlsch structures for UE %d \n", i);
- exit(-1);
+ LOG_E(PHY,"Can't get gNB dlsch structures for UE %d \n", i);
+ exit(-1);
}/* else {
- gNB->dlsch[i][j]->rnti=0;
- LOG_D(PHY,"dlsch[%d][%d] => %p rnti:%d\n",i,j,gNB->dlsch[i][j], gNB->dlsch[i][j]->rnti);
+
+ gNB->dlsch[i][j]->rnti=0;
+ LOG_D(PHY,"dlsch[%d][%d] => %p rnti:%d\n",i,j,gNB->dlsch[i][j], gNB->dlsch[i][j]->rnti);
}*/
}
-
+
//LOG_I(PHY,"Allocating Transport Channel Buffer for ULSCH, UE %d\n",i);
//gNB->ulsch[1+i] = new_gNB_ulsch(MAX_TURBO_ITERATIONS,fp->N_RB_UL, 0);
-
/*if (!gNB->ulsch[1+i]) {
LOG_E(PHY,"Can't get gNB ulsch structures\n");
exit(-1);
}*/
-
// this is the transmission mode for the signalling channels
// this will be overwritten with the real transmission mode by the RRC once the UE is connected
//gNB->transmission_mode[i] = fp->nb_antenna_ports_gNB==1 ? 1 : 2;
}
+
// ULSCH for RA
//gNB->ulsch[0] = new_gNB_ulsch(MAX_TURBO_ITERATIONS, fp->N_RB_UL, 0);
-
/*if (!gNB->ulsch[0]) {
LOG_E(PHY,"Can't get gNB ulsch structures\n");
exit(-1);
@@ -523,21 +477,14 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
LOG_D(PHY,"gNB %d.%d : RA %p\n",gNB->Mod_id,gNB->CC_id,gNB->dlsch_ra);
gNB->dlsch_MCH = new_gNB_dlsch(1,8,NSOFT, 0, fp, cfg);
LOG_D(PHY,"gNB %d.%d : MCH %p\n",gNB->Mod_id,gNB->CC_id,gNB->dlsch_MCH);
-
-
gNB->rx_total_gain_dB=130;
-
+
for(i=0; imu_mimo_mode[i].dl_pow_off = 2;
-
+
gNB->check_for_total_transmissions = 0;
-
gNB->check_for_MUMIMO_transmissions = 0;
-
gNB->FULL_MUMIMO_transmissions = 0;
-
gNB->check_for_SUMIMO_transmissions = 0;
-
//fp->pucch_config_common.deltaPUCCH_Shift = 1;
-
}
diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c
index fc207cee84..18bf3b423b 100644
--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -919,7 +919,7 @@ void init_nr_ue_transport(PHY_VARS_NR_UE *ue,int abstraction_flag) {
for (i=0; idlsch[k][i][j] = new_nr_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_LDPC_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag))!=NULL,"Can't get ue dlsch structures\n");
LOG_D(PHY,"dlsch[%d][%d][%d] => %p\n",k,i,j,ue->dlsch[i][j]);
diff --git a/openair1/PHY/MODULATION/slot_fep_nr.c b/openair1/PHY/MODULATION/slot_fep_nr.c
index 8ef29d016d..1e1751fe24 100644
--- a/openair1/PHY/MODULATION/slot_fep_nr.c
+++ b/openair1/PHY/MODULATION/slot_fep_nr.c
@@ -54,13 +54,19 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
//int i;
unsigned int frame_length_samples = frame_parms->samples_per_subframe * 10;
unsigned int rx_offset;
- NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[ue->current_thread_id[Ns>>1]][0];
- uint16_t coreset_start_subcarrier = frame_parms->first_carrier_offset+((int)floor(frame_parms->ssb_start_subcarrier/NR_NB_SC_PER_RB)+pdcch_vars->coreset[0].rb_offset)*NR_NB_SC_PER_RB;
- uint16_t nb_rb_coreset = 24;
- uint16_t bwp_start_subcarrier = frame_parms->first_carrier_offset+516;
+ NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[ue->current_thread_id[Ns]][0];
+ uint16_t coreset_start_subcarrier = frame_parms->first_carrier_offset;//+((int)floor(frame_parms->ssb_start_subcarrier/NR_NB_SC_PER_RB)+pdcch_vars->coreset[0].rb_offset)*NR_NB_SC_PER_RB;
+ uint16_t nb_rb_coreset = 0;
+ uint16_t bwp_start_subcarrier = frame_parms->first_carrier_offset;//+516;
uint16_t nb_rb_pdsch = 50;
uint8_t p=0;
- uint8_t l0 = 2;
+ uint8_t l0 = pdcch_vars->coreset[0].duration;
+ uint64_t coreset_freq_dom = pdcch_vars->coreset[0].frequencyDomainResources;
+ for (int i = 0; i < 45; i++) {
+ if (((coreset_freq_dom & 0x1FFFFFFFFFFF) >> i) & 0x1) nb_rb_coreset++;
+ }
+ nb_rb_coreset = 6 * nb_rb_coreset;
+ //printf("corset duration %d nb_rb_coreset %d\n", l0, nb_rb_coreset);
void (*dft)(int16_t *,int16_t *, int);
int tmp_dft_in[8192] __attribute__ ((aligned (32))); // This is for misalignment issues for 6 and 15 PRBs
@@ -104,9 +110,9 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
}
if (no_prefix) {
- slot_offset = frame_parms->ofdm_symbol_size * (frame_parms->symbols_per_slot*frame_parms->slots_per_subframe) * (Ns>>1);
+ slot_offset = frame_parms->ofdm_symbol_size * (frame_parms->symbols_per_slot) * (Ns);
} else {
- slot_offset = (frame_parms->samples_per_subframe) * (Ns>>1);
+ slot_offset = (frame_parms->samples_per_slot) * (Ns);
}
/*if (l<0 || l>=7-frame_parms->Ncp) {
@@ -122,7 +128,7 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
for (aa=0; aanb_antennas_rx; aa++) {
- memset(&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],0,frame_parms->ofdm_symbol_size*sizeof(int));
+ memset(&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],0,frame_parms->ofdm_symbol_size*sizeof(int));
rx_offset = sample_offset + slot_offset + nb_prefix_samples0 - SOFFSET;
// Align with 256 bit
@@ -130,8 +136,8 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
#ifdef DEBUG_FEP
// if (ue->frame <100)
- /*LOG_I(PHY,*/printf("slot_fep: frame %d: slot %d, symbol %d, nb_prefix_samples %d, nb_prefix_samples0 %d, slot_offset %d, subframe_offset %d, sample_offset %d,rx_offset %d, frame_length_samples %d\n", ue->proc.proc_rxtx[(Ns>>1)&1].frame_rx,Ns, symbol,
- nb_prefix_samples,nb_prefix_samples0,slot_offset,subframe_offset,sample_offset,rx_offset,frame_length_samples);
+ /*LOG_I(PHY,*/printf("slot_fep: frame %d: slot %d, symbol %d, nb_prefix_samples %d, nb_prefix_samples0 %d, slot_offset %d, sample_offset %d,rx_offset %d, frame_length_samples %d\n", ue->proc.proc_rxtx[(Ns)&1].frame_rx,Ns, symbol,
+ nb_prefix_samples,nb_prefix_samples0,slot_offset,sample_offset,rx_offset,frame_length_samples);
#endif
if (l==0) {
@@ -146,14 +152,14 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
(void *)&common_vars->rxdata[aa][rx_offset % frame_length_samples],
frame_parms->ofdm_symbol_size*sizeof(int));
dft((int16_t *)tmp_dft_in,
- (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
+ (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
} else { // use dft input from RX buffer directly
#if UE_TIMING_TRACE
start_meas(&ue->rx_dft_stats);
#endif
dft((int16_t *)&common_vars->rxdata[aa][(rx_offset) % frame_length_samples],
- (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
+ (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
#if UE_TIMING_TRACE
stop_meas(&ue->rx_dft_stats);
#endif
@@ -175,11 +181,11 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
(void *)&common_vars->rxdata[aa][(rx_offset) % frame_length_samples],
frame_parms->ofdm_symbol_size*sizeof(int));
dft((int16_t *)tmp_dft_in,
- (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
+ (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
} else { // use dft input from RX buffer directly
dft((int16_t *)&common_vars->rxdata[aa][(rx_offset) % frame_length_samples],
- (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
+ (int16_t *)&common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
}
#if UE_TIMING_TRACE
stop_meas(&ue->rx_dft_stats);
diff --git a/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c b/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
index 2e5ad47d91..e0c17bfb75 100644
--- a/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
+++ b/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
@@ -32,6 +32,7 @@
//#define NR_PBCH_DMRS_LENGTH_DWORD 5
//#define NR_PBCH_DMRS_LENGTH 144
+//#define DEBUG_PDCCH
#include "refsig_defs_ue.h"
#include "PHY/defs_nr_UE.h"
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c
index bd2abebdf0..929ac823dd 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c
@@ -20,7 +20,7 @@
*/
/*! \file PHY/NR_TRANSPORT/nr_dci.c
-* \brief Implements DCI encoding and PDCCH TX procedures (38.212/38.213/38.214). V15.2.0 2018-06.
+* \brief Implements DCI encoding and PDCCH TX procedures (38.212/38.213/38.214). V15.4.0 2019-01.
* \author Guy De Souza
* \date 2018
* \version 0.1
@@ -35,20 +35,18 @@
//#define DEBUG_PDCCH_DMRS
//#define DEBUG_DCI
//#define DEBUG_CHANNEL_CODING
-#define PDCCH_TEST_POLAR_TEMP_FIX
extern short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT];
uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,
- nfapi_nr_rnti_type_e rnti_type,
- uint16_t N_RB,
- nfapi_nr_config_request_t* config)
-{
+ nfapi_nr_rnti_type_e rnti_type,
+ uint16_t N_RB,
+ nfapi_nr_config_request_t *config) {
uint16_t size = 0;
switch(format) {
-/*Only sizes for 0_0 and 1_0 are correct at the moment*/
+ /*Only sizes for 0_0 and 1_0 are correct at the moment*/
case NFAPI_NR_UL_DCI_FORMAT_0_0:
/// fixed: Format identifier 1, Hop flag 1, MCS 5, NDI 1, RV 2, HARQ PID 4, PUSCH TPC 2 Time Domain assgnmt 4 --20
size += 20;
@@ -83,7 +81,6 @@ uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,
/// fixed: Format identifier 1, VRB2PRB 1, MCS 5, NDI 1, RV 2, HARQ PID 4, DAI 2, PUCCH TPC 2, PUCCH RInd 3, PDSCH to HARQ TInd 3 Time Domain assgnmt 4 -- 28
size += 28;
size += (uint8_t)ceil( log2( (N_RB*(N_RB+1))>>1 ) ); // Freq domain assignment
-
break;
case NFAPI_NR_DL_DCI_FORMAT_1_1:
@@ -96,7 +93,7 @@ uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,
// PRB bundling size indicator
// Rate matching indicator
// ZP CSI-RS trigger
- /// TB1- MCS 5, NDI 1, RV 2
+ /// TB1- MCS 5, NDI 1, RV 2
size += 8;
// TB2
size += 4 ; // HARQ PID
@@ -110,7 +107,6 @@ uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,
// CBGTI
// CBGFI
size += 1; // DMRS sequence init
-
break;
case NFAPI_NR_DL_DCI_FORMAT_2_0:
@@ -125,8 +121,8 @@ uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,
case NFAPI_NR_DL_DCI_FORMAT_2_3:
break;
- default:
- AssertFatal(1==0, "Invalid NR DCI format %d\n", format);
+ default:
+ AssertFatal(1==0, "Invalid NR DCI format %d\n", format);
}
return size;
@@ -136,11 +132,9 @@ void nr_pdcch_scrambling(uint32_t *in,
uint16_t size,
uint32_t Nid,
uint32_t n_RNTI,
- uint32_t* out) {
-
+ uint32_t *out) {
uint8_t reset;
uint32_t x1, x2, s=0;
-
reset = 1;
x2 = (n_RNTI<<16) + Nid;
@@ -148,193 +142,228 @@ void nr_pdcch_scrambling(uint32_t *in,
if ((i&0x1f)==0) {
s = lte_gold_generic(&x1, &x2, reset);
reset = 0;
- if (i){
- in++;
- out++;
+
+ if (i) {
+ in++;
+ out++;
}
}
- (*out) ^= ((((*in)>>(i&0x1f))&1) ^ ((s>>(i&0x1f))&1))<<(i&0x1f);
- // printf("nr_pdcch_scrambling: in %d => out %d\n",((*in)>>(i&0x1f))&1,((*out)>>(i&0x1f))&1);
- }
+ (*out) ^= ((((*in)>>(i&0x1f))&1) ^ ((s>>(i&0x1f))&1))<<(i&0x1f);
+ //printf("nr_pdcch_scrambling: in %d seq 0x%08x => out %d\n",((*in)>>(i&0x1f))&1,s,((*out)>>(i&0x1f))&1);
+ }
}
uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars,
- t_nrPolar_paramsPtr *nrPolar_params,
uint32_t **gold_pdcch_dmrs,
- int32_t* txdataF,
+ int32_t *txdataF,
int16_t amp,
NR_DL_FRAME_PARMS frame_parms,
- nfapi_nr_config_request_t config)
-{
-
+ nfapi_nr_config_request_t config) {
int16_t mod_dmrs[NR_MAX_CSET_DURATION][NR_MAX_PDCCH_DMRS_LENGTH>>1]; // 3 for the max coreset duration
- uint8_t idx=0;
- //uint16_t a;
+ uint32_t dmrs_seq[NR_MAX_PDCCH_DMRS_INIT_LENGTH_DWORD];
+ uint16_t dmrs_offset=0;
+ uint16_t cset_start_sc;
+ uint8_t cset_start_symb, cset_nsymb;
int k,l,k_prime,dci_idx, dmrs_idx;
nr_cce_t cce;
nr_reg_t reg;
nr_reg_t reg_mapping_list[NR_MAX_PDCCH_AGG_LEVEL*NR_NB_REG_PER_CCE];
-
/*First iteration: single DCI*/
NR_gNB_DCI_ALLOC_t dci_alloc = pdcch_vars.dci_alloc[0];
nfapi_nr_dl_config_pdcch_parameters_rel15_t pdcch_params = dci_alloc.pdcch_params;
- uint16_t dmrs_length = dci_alloc.L*36; //2(QPSK)*3(per RB)*6(REG per CCE)
- uint16_t encoded_length = dci_alloc.L*108; //2(QPSK)*9(per RB)*6(REG per CCE)
/*The coreset is initialised
- * in frequency: the first subcarrier is obtained by adding the first CRB overlapping the SSB and the rb_offset
+ * in frequency: the first subcarrier is obtained by adding the first CRB overlapping the SSB and the rb_offset for coreset 0
+ * or the rb_offset for other coresets
* in time: by its first slot and its first symbol*/
- uint16_t cset_start_sc = frame_parms.first_carrier_offset + ((int)floor(frame_parms.ssb_start_subcarrier/NR_NB_SC_PER_RB)+pdcch_params.rb_offset)*NR_NB_SC_PER_RB;
- // uint8_t cset_start_symb = pdcch_params.first_slot*frame_parms.symbols_per_slot + pdcch_params.first_symbol;
- uint8_t cset_start_symb = pdcch_params.first_symbol;
- uint8_t cset_nsymb = pdcch_params.n_symb;
- dci_idx = 0;
+ if (pdcch_params.config_type == NFAPI_NR_CSET_CONFIG_MIB_SIB1) {
+ cset_start_sc = frame_parms.first_carrier_offset + (frame_parms.ssb_start_subcarrier/NR_NB_SC_PER_RB +
+ pdcch_params.rb_offset)*NR_NB_SC_PER_RB;
+ } else
+ cset_start_sc = frame_parms.first_carrier_offset + pdcch_params.rb_offset*NR_NB_SC_PER_RB;
+ cset_start_symb = pdcch_params.first_symbol;
+ cset_nsymb = pdcch_params.n_symb;
+ dci_idx = 0;
+ LOG_I(PHY, "Coreset starting subcarrier %d on symbol %d (%d symbols)\n", cset_start_sc, cset_start_symb, cset_nsymb);
+ // DMRS length is per OFDM symbol
+ uint16_t dmrs_length = (pdcch_params.precoder_granularity == NFAPI_NR_CSET_ALL_CONTIGUOUS_RBS)?
+ (pdcch_params.n_rb*6) : (dci_alloc.L*36/cset_nsymb); //2(QPSK)*3(per RB)*6(REG per CCE)
+ uint16_t encoded_length = dci_alloc.L*108; //2(QPSK)*9(per RB)*6(REG per CCE)
+ LOG_I(PHY, "DMRS length per symbol %d\t DCI encoded length %d\n", dmrs_length, encoded_length);
/// DMRS QPSK modulation
- /*There is a need to shift from which index the pregenerated DMRS sequence is used
- * see 38211 r15.2.0 section 7.4.1.3.2: assumption is the reference point for k refers to the DMRS sequence*/
- if (pdcch_params.config_type == NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG)
- gold_pdcch_dmrs += ((int)floor(frame_parms.ssb_start_subcarrier/NR_NB_SC_PER_RB)+pdcch_params.rb_offset)*3/32;
+ /*There is a need to shift from which index the pregenerated DMRS sequence is used
+ * see 38211 r15.2.0 section 7.4.1.3.2: assumption is the reference point for k refers to the DMRS sequence*/
+ if (pdcch_params.config_type == NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG) {
+ for (int symb=cset_start_symb; symb>5;
+
+ dmrs_offset = (pdcch_params.rb_offset*3)&0x1f;
+ LOG_I(PHY, "PDCCH DMRS offset %d\n", dmrs_offset);
+ }
for (int symb=cset_start_symb; symb>1; i++) {
- idx = ((((gold_pdcch_dmrs[symb][(i<<1)>>5])>>((i<<1)&0x1f))&1)<<1) ^ (((gold_pdcch_dmrs[symb][((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1);
- mod_dmrs[symb][i<<1] = nr_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
- mod_dmrs[symb][(i<<1)+1] = nr_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];
- #ifdef DEBUG_PDCCH_DMRS
- printf("symb %d i %d idx %d gold seq %u b0-b1 %d-%d mod_dmrs %d %d\n", symb, i, idx, gold_pdcch_dmrs[symb][(i<<1)>>5],
- (((gold_pdcch_dmrs[symb][(i<<1)>>5])>>((i<<1)&0x1f))&1), (((gold_pdcch_dmrs[symb][((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1),
- mod_dmrs[symb][(i<<1)], mod_dmrs[symb][(i<<1)+1]);
- #endif
- }
+ if (dmrs_offset) {
+ // a non zero offset requires the DMRS sequence to be rearranged
+ memset(dmrs_seq,0, NR_MAX_PDCCH_DMRS_INIT_LENGTH_DWORD*sizeof(uint32_t));
+
+ for (int i=0; i>5)] |= ((gold_pdcch_dmrs[symb][(i+dmrs_offset)>>5]>>((i+dmrs_offset)&0x1f))&1)<<(i&0x1f);
+#ifdef DEBUG_PDCCH_DMRS
+ //printf("out 0x%08x in 0x%08x \n", dmrs_seq[(i>>5)], gold_pdcch_dmrs[symb][(i+dmrs_offset)>>5]);
+#endif
+ }
+
+ nr_modulation(dmrs_seq, dmrs_length, MOD_QPSK, mod_dmrs[symb]);
+ } else
+ nr_modulation(gold_pdcch_dmrs[symb], dmrs_length, MOD_QPSK, mod_dmrs[symb]);
+
+#ifdef DEBUG_PDCCH_DMRS
+
+ for (int i=0; i>1; i++)
+ if (dmrs_offset)
+ printf("symb %d i %d gold seq 0x%08x mod_dmrs %d %d\n", symb, i, dmrs_seq[i>>5],
+ mod_dmrs[symb][i<<1], mod_dmrs[symb][(i<<1)+1] );
+ else
+ printf("symb %d i %d gold seq 0x%08x mod_dmrs %d %d\n", symb, i,
+ gold_pdcch_dmrs[symb][i>>5], mod_dmrs[symb][i<<1], mod_dmrs[symb][(i<<1)+1] );
+
+#endif
}
/// DCI payload processing
- // CRC attachment + Scrambling + Channel coding + Rate matching
+ // CRC attachment + Scrambling + Channel coding + Rate matching
uint32_t encoder_output[NR_MAX_DCI_SIZE_DWORD];
- uint16_t n_RNTI = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? ((pdcch_params.scrambling_id)?pdcch_params.rnti:0) : 0;
- uint16_t Nid = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? pdcch_params.scrambling_id : config.sch_config.physical_cell_id.value;
-//#ifdef PDCCH_TEST_POLAR_TEMP_FIX
-// nr_polar_init(¤tPtr, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
-// t_nrPolar_paramsPtr currentPtr = nr_polar_params(*nrPolar_params, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
-//#else
- nr_polar_init(nrPolar_params, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
- t_nrPolar_paramsPtr currentPtr = nr_polar_params(*nrPolar_params, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
-//#endif
-
- //polar_encoder_dci(dci_alloc.dci_pdu, encoder_output, currentPtr, pdcch_params.rnti);
+ uint16_t n_RNTI = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? pdcch_params.rnti:0;
+ uint16_t Nid = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)?
+ pdcch_params.scrambling_id : config.sch_config.physical_cell_id.value;
+ t_nrPolar_params *currentPtr = nr_polar_params(NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
polar_encoder_fast(dci_alloc.dci_pdu, encoder_output, pdcch_params.rnti,currentPtr);
-
#ifdef DEBUG_CHANNEL_CODING
printf("polar rnti %d\n",pdcch_params.rnti);
- for (int i=0;i<54;i++) printf("Encoded Payload: [%d]->0x%08x \n", i,encoder_output[i]);
+ printf("DCI PDU: [0]->0x%lx \t [1]->0x%lx\n",
+ dci_alloc.dci_pdu[0], dci_alloc.dci_pdu[1]);
+ printf("Encoded Payload (length:%d dwords):\n", encoded_length>>5);
- printf("DCI PDU: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- dci_alloc.dci_pdu[0], dci_alloc.dci_pdu[1], dci_alloc.dci_pdu[2], dci_alloc.dci_pdu[3]);
- printf("Encoded Payload: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
- encoder_output[0], encoder_output[1], encoder_output[2], encoder_output[3]);
+ for (int i=0; i>5; i++)
+ printf("[%d]->0x%08x \t", i,encoder_output[i]);
+
+ printf("\n");
#endif
-
/// Scrambling
- uint32_t scrambled_output[NR_MAX_DCI_SIZE_DWORD]={0};
+ uint32_t scrambled_output[NR_MAX_DCI_SIZE_DWORD]= {0};
nr_pdcch_scrambling(encoder_output, encoded_length, Nid, n_RNTI, scrambled_output);
#ifdef DEBUG_CHANNEL_CODING
-printf("scrambled output: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\t [4]->0x%08x\t [5]->0x%08x\t \
+ printf("scrambled output: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\t [4]->0x%08x\t [5]->0x%08x\t \
[6]->0x%08x \t [7]->0x%08x \t [8]->0x%08x \t [9]->0x%08x\t [10]->0x%08x\t [11]->0x%08x\n",
- scrambled_output[0], scrambled_output[1], scrambled_output[2], scrambled_output[3], scrambled_output[4],scrambled_output[5],
- scrambled_output[6], scrambled_output[7], scrambled_output[8], scrambled_output[9], scrambled_output[10],scrambled_output[11] );
+ scrambled_output[0], scrambled_output[1], scrambled_output[2], scrambled_output[3], scrambled_output[4],scrambled_output[5],
+ scrambled_output[6], scrambled_output[7], scrambled_output[8], scrambled_output[9], scrambled_output[10],scrambled_output[11] );
#endif
-
- // QPSK modulation
+ /// QPSK modulation
int16_t mod_dci[NR_MAX_DCI_SIZE>>1];
- for (int i=0; i>1; i++) {
- idx = ((((scrambled_output[(i<<1)>>5])>>((i<<1)&0x1f))&1)<<1) ^ (((scrambled_output[((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1);
- mod_dci[i<<1] = nr_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
- mod_dci[(i<<1)+1] = nr_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];
+ nr_modulation(scrambled_output, encoded_length, MOD_QPSK, mod_dci);
#ifdef DEBUG_DCI
- printf("i %d idx %d b0-b1 %d-%d mod_dci %d %d\n", i, idx, (((scrambled_output[(i<<1)>>5])>>((i<<1)&0x1f))&1),
- (((scrambled_output[((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1), mod_dci[(i<<1)], mod_dci[(i<<1)+1]);
+
+ for (int i=0; i>1; i++)
+ printf("i %d mod_dci %d %d\n", i, mod_dci[i<<1], mod_dci[(i<<1)+1] );
+
#endif
- }
/// Resource mapping
- if (cset_start_sc >= frame_parms.ofdm_symbol_size)
- cset_start_sc -= frame_parms.ofdm_symbol_size;
+ if (cset_start_sc >= frame_parms.ofdm_symbol_size)
+ cset_start_sc -= frame_parms.ofdm_symbol_size;
+ /*Reorder REG list for a freq first mapping*/
+ uint8_t symb_idx[NR_MAX_CSET_DURATION] = {0,0,0};
+ uint8_t nb_regs = dci_alloc.L*NR_NB_REG_PER_CCE;
+ uint8_t regs_per_symb = nb_regs/cset_nsymb;
- /*Reorder REG list for a freq first mapping*/
- uint8_t symb_idx[NR_MAX_CSET_DURATION] = {0,0,0};
- uint8_t nb_regs = dci_alloc.L*NR_NB_REG_PER_CCE;
- uint8_t regs_per_symb = nb_regs/cset_nsymb;
- for (int cce_idx=0; cce_idx> 15;
- ((int16_t*)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[l][(dmrs_idx<<1) + 1]) >> 15;
-#ifdef DEBUG_PDCCH_DMRS
- printf("symbol %d position %d => (%d,%d)\n",l,k,((int16_t*)txdataF[aa])[(l*frame_parms.ofdm_symbol_size + k)<<1] , ((int16_t*)txdataF[aa])[((l*frame_parms.ofdm_symbol_size + k)<<1)+1]);
-#endif
- k+=4;
- if (k >= frame_parms.ofdm_symbol_size)
- k -= frame_parms.ofdm_symbol_size;
- dmrs_idx++;
- }
- }
- }
+ printf("\n Ordered REG list:\n");
- /*Now mapping the encoded DCI based on newly constructed REG list
- * and the DMRS for the precoder granularity same as REG bundle*/
- for (int reg_idx=0; reg_idx= frame_parms.ofdm_symbol_size)
- k -= frame_parms.ofdm_symbol_size;
- l = cset_start_symb + reg.symb_idx;
- dmrs_idx = (reg.reg_idx/cset_nsymb)*3;
- k_prime = 0;
- for (int m=0; m> 15;
- ((int16_t*)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[l][(dmrs_idx<<1) + 1]) >> 15;
-#ifdef DEBUG_PDCCH_DMRS
- printf("l %d position %d => (%d,%d)\n",l,k,((int16_t*)txdataF[aa])[(l*frame_parms.ofdm_symbol_size + k)<<1] , ((int16_t*)txdataF[aa])[((l*frame_parms.ofdm_symbol_size + k)<<1)+1]);
+ for (int i=0; i> 15;
- ((int16_t*)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dci[(dci_idx<<1) + 1]) >> 15;
- //printf("dci output %d %d\n",(a * mod_dci[dci_idx<<1]) >> 15, (a * mod_dci[(dci_idx<<1) + 1]) >> 15);
- dci_idx++;
- }
- k++;
+
+ if (pdcch_params.precoder_granularity == NFAPI_NR_CSET_ALL_CONTIGUOUS_RBS) {
+ /*in this case the DMRS are mapped on all the coreset*/
+ for (l=cset_start_symb; l>1) * mod_dmrs[l][dmrs_idx<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = ((amp>>1) * mod_dmrs[l][(dmrs_idx<<1) + 1]) >> 15;
+#ifdef DEBUG_PDCCH_DMRS
+ printf("symbol %d position %d => (%d,%d)\n",l,k,((int16_t *)txdataF)[(l*frame_parms.ofdm_symbol_size + k)<<1],
+ ((int16_t *)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1)+1]);
+#endif
+ k+=4;
+
if (k >= frame_parms.ofdm_symbol_size)
k -= frame_parms.ofdm_symbol_size;
+
+ dmrs_idx++;
}
}
+ }
+
+ /*Now mapping the encoded DCI based on newly constructed REG list
+ * and the DMRS for the precoder granularity same as REG bundle*/
+ for (int reg_idx=0; reg_idx= frame_parms.ofdm_symbol_size)
+ k -= frame_parms.ofdm_symbol_size;
+
+ l = cset_start_symb + reg.symb_idx;
+ dmrs_idx = (reg.reg_idx/cset_nsymb)*3;
+ k_prime = 0;
+
+ for (int m=0; m>1) * mod_dmrs[l][dmrs_idx<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = ((amp>>1) * mod_dmrs[l][(dmrs_idx<<1) + 1]) >> 15;
+#ifdef DEBUG_PDCCH_DMRS
+ printf("l %d position %d => (%d,%d)\n",l,k,((int16_t *)txdataF)[(l*frame_parms.ofdm_symbol_size + k)<<1],
+ ((int16_t *)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1)+1]);
+#endif
+ dmrs_idx++;
+ }
+
+ k_prime++;
+ } else { // DCI payload
+ ((int16_t *)txdataF)[(l*frame_parms.ofdm_symbol_size + k)<<1] = (amp * mod_dci[dci_idx<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dci[(dci_idx<<1) + 1]) >> 15;
+#ifdef DEBUG_DCI
+ printf("l %d position %d => (%d,%d)\n",l,k,((int16_t *)txdataF)[(l*frame_parms.ofdm_symbol_size + k)<<1],
+ ((int16_t *)txdataF)[((l*frame_parms.ofdm_symbol_size + k)<<1)+1]);
+#endif
+ dci_idx++;
+ }
+
+ k++;
+
+ if (k >= frame_parms.ofdm_symbol_size)
+ k -= frame_parms.ofdm_symbol_size;
+ }
+ }
return 0;
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.h b/openair1/PHY/NR_TRANSPORT/nr_dci.h
index 4bf250dbff..21fcd06c09 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.h
@@ -28,14 +28,13 @@
typedef unsigned __int128 uint128_t;
uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,
- nfapi_nr_rnti_type_e rnti_type,
- uint16_t N_RB,
- nfapi_nr_config_request_t* config);
+ nfapi_nr_rnti_type_e rnti_type,
+ uint16_t N_RB,
+ nfapi_nr_config_request_t *config);
uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars,
- t_nrPolar_paramsPtr *nrPolar_params,
uint32_t **gold_pdcch_dmrs,
- int32_t* txdataF,
+ int32_t *txdataF,
int16_t amp,
NR_DL_FRAME_PARMS frame_parms,
nfapi_nr_config_request_t config);
@@ -44,7 +43,7 @@ void nr_pdcch_scrambling(uint32_t *in,
uint16_t size,
uint32_t Nid,
uint32_t n_RNTI,
- uint32_t* out);
+ uint32_t *out);
void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
int frame,
@@ -54,7 +53,7 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
nfapi_nr_dl_config_dci_dl_pdu *pdu,
nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu);
-void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m);
+void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t *dci_alloc, uint16_t n_shift, uint8_t m);
#endif //__PHY_NR_TRANSPORT_DCI__H
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
index 1d29b057fc..06c0e30bde 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
@@ -36,7 +36,6 @@
#include "nr_dlsch.h"
-
void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m) {
nr_cce_t* cce;
@@ -48,6 +47,8 @@ void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m
uint8_t R = pdcch_params->interleaver_size;
uint16_t N_reg = pdcch_params->n_rb * pdcch_params->n_symb;
uint16_t Y, N_cce, M_s_max, n_CI=0, tmp, C;
+ uint16_t n_RNTI = (pdcch_params->search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? pdcch_params->rnti:0;
+ uint32_t A[3]={39827,39829,39839};
if (pdcch_params->config_type == NFAPI_NR_CSET_CONFIG_MIB_SIB1)
AssertFatal(L>=4, "Invalid aggregation level for SIB1 configured PDCCH %d\n", L);
@@ -59,13 +60,16 @@ void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m
if (pdcch_params->search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_COMMON)
Y = 0;
else { //NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC
+ Y = (A[0]*n_RNTI)%65537; // Candidate 0, antenna port 0
}
- uint8_t cond = N_reg%(bsize*R);
- AssertFatal(cond==0, "CCE to REG interleaving: Invalid configuration leading to non integer C\n");
- C = N_reg/(bsize*R);
+ if (pdcch_params->cr_mapping_type == NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED) {
+ AssertFatal((N_reg%(bsize*R))==0, "CCE to REG interleaving: Invalid configuration leading to non integer C (N_reg %d, bsize %d R %d)\n",
+ N_reg, bsize, R);
+ C = N_reg/(bsize*R);
+ }
- tmp = L * (( Y + (m*N_cce)/(L*M_s_max) + n_CI ) % (N_cce/L));
+ tmp = L * (( Y + (m*N_cce)/(L*M_s_max) + n_CI ) % CEILIDIV(N_cce,L));
LOG_I(PHY, "CCE list generation for candidate %d: bundle size %d ilv size %d tmp %d\n", m, bsize, R, tmp);
for (uint8_t cce_idx=0; cce_idx>i)&1)<<(size-i-1);
+ return ret;
+}*/
+
void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
int frame,
int subframe,
@@ -154,51 +165,66 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
case NFAPI_NR_DL_DCI_FORMAT_1_0:
switch(params_rel15->rnti_type) {
case NFAPI_NR_RNTI_RA:
- // printf("dci_pdu %llx\n",(unsigned long long int)*dci_pdu);
+
// Freq domain assignment
fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
pos=fsize;
*dci_pdu |= ((pdu_rel15->frequency_domain_assignment&((1<size-pos));
#ifdef DEBUG_FILL_DCI
- printf("frequency-domain assignment %d (%d bits)=> %d (%llx)\n",pdu_rel15->frequency_domain_assignment,fsize,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+ printf("frequency-domain assignment %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->frequency_domain_assignment,fsize,dci_alloc->size-pos,*dci_pdu);
#endif
// Time domain assignment
pos+=4;
- *dci_pdu |= ((pdu_rel15->time_domain_assignment&0xf) << (dci_alloc->size-pos));
+ *dci_pdu |= (((uint64_t)pdu_rel15->time_domain_assignment&0xf) << (dci_alloc->size-pos));
#ifdef DEBUG_FILL_DCI
- printf("time-domain assignment %d (3 bits)=> %d (%llx)\n",pdu_rel15->time_domain_assignment,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+ printf("time-domain assignment %d (3 bits)=> %d (0x%lx)\n",pdu_rel15->time_domain_assignment,dci_alloc->size-pos,*dci_pdu);
#endif
// VRB to PRB mapping
pos++;
- *dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&0x1)<<(dci_alloc->size-pos);
+ *dci_pdu |= ((uint64_t)pdu_rel15->vrb_to_prb_mapping&0x1)<<(dci_alloc->size-pos);
#ifdef DEBUG_FILL_DCI
- printf("vrb to prb mapping %d (1 bits)=> %d (%llx)\n",pdu_rel15->vrb_to_prb_mapping,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+ printf("vrb to prb mapping %d (1 bits)=> %d (0x%lx)\n",pdu_rel15->vrb_to_prb_mapping,dci_alloc->size-pos,*dci_pdu);
#endif
// MCS
pos+=5;
- *dci_pdu |= (pdu_rel15->mcs&0x1f)<<(dci_alloc->size-pos);
+ *dci_pdu |= ((uint64_t)pdu_rel15->mcs&0x1f)<<(dci_alloc->size-pos);
#ifdef DEBUG_FILL_DCI
- printf("mcs %d (5 bits)=> %d (%llx)\n",pdu_rel15->mcs,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+ printf("mcs %d (5 bits)=> %d (0x%lx)\n",pdu_rel15->mcs,dci_alloc->size-pos,*dci_pdu);
#endif
// TB scaling
pos+=2;
- *dci_pdu |= (pdu_rel15->tb_scaling&0x3)<<(dci_alloc->size-pos);
+ *dci_pdu |= ((uint64_t)pdu_rel15->tb_scaling&0x3)<<(dci_alloc->size-pos);
#ifdef DEBUG_FILL_DCI
- printf("tb_scaling %d (2 bits)=> %d (%llx)\n",pdu_rel15->tb_scaling,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+ printf("tb_scaling %d (2 bits)=> %d (0x%lx)\n",pdu_rel15->tb_scaling,dci_alloc->size-pos,*dci_pdu);
#endif
break;
- case NFAPI_NR_RNTI_C:
+ case NFAPI_NR_RNTI_C:
+
// indicating a DL DCI format 1bit
pos++;
- *dci_pdu |= (pdu_rel15->format_indicator&1)<<(dci_alloc->size-pos);
+ *dci_pdu |= ((uint64_t)pdu_rel15->format_indicator&1)<<(dci_alloc->size-pos);
+#ifdef DEBUG_FILL_DCI
+ printf("Format indicator %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->format_indicator,1,dci_alloc->size-pos,*dci_pdu);
+#endif
+
// Freq domain assignment (275rb >> fsize = 16)
fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
pos+=fsize;
- *dci_pdu |= ((pdu_rel15->frequency_domain_assignment&((1<size-pos));
+ *dci_pdu |= (((uint64_t)pdu_rel15->frequency_domain_assignment&((1<size-pos));
- if (((pdu_rel15->frequency_domain_assignment+1)&1) ==0) //fsize are all 1 38.212 p86
+#ifdef DEBUG_FILL_DCI
+ printf("Freq domain assignment %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->frequency_domain_assignment,fsize,dci_alloc->size-pos,*dci_pdu);
+#endif
+
+ uint16_t is_ra = 1;
+ for (int i=0; ifrequency_domain_assignment>>i)&1)) {
+ is_ra = 0;
+ break;
+ }
+ if (is_ra) //fsize are all 1 38.212 p86
{
// ra_preamble_index 6 bits
pos+=6;
@@ -223,44 +249,73 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
// Time domain assignment 4bit
pos+=4;
- *dci_pdu |= ((pdu_rel15->time_domain_assignment&0xf) << (dci_alloc->size-pos));
+ *dci_pdu |= ((pdu_rel15->time_domain_assignment&0xf) << (dci_alloc->size-pos));
+#ifdef DEBUG_FILL_DCI
+ printf("Time domain assignment %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->time_domain_assignment,4,dci_alloc->size-pos,*dci_pdu);
+#endif
-
// VRB to PRB mapping 1bit
pos++;
*dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos);
-
+#ifdef DEBUG_FILL_DCI
+ printf("VRB to PRB %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->vrb_to_prb_mapping,1,dci_alloc->size-pos,*dci_pdu);
+#endif
+
// MCS 5bit //bit over 32, so dci_pdu ++
pos+=5;
*dci_pdu |= (pdu_rel15->mcs&0x1f)<<(dci_alloc->size-pos);
-
+#ifdef DEBUG_FILL_DCI
+ printf("MCS %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->mcs,5,dci_alloc->size-pos,*dci_pdu);
+#endif
+
// New data indicator 1bit
pos++;
*dci_pdu |= (pdu_rel15->ndi&1)<<(dci_alloc->size-pos);
-
+#ifdef DEBUG_FILL_DCI
+ printf("NDI %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->ndi,1,dci_alloc->size-pos,*dci_pdu);
+#endif
+
// Redundancy version 2bit
pos+=2;
*dci_pdu |= (pdu_rel15->rv&0x3)<<(dci_alloc->size-pos);
-
+#ifdef DEBUG_FILL_DCI
+ printf("RV %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->rv,2,dci_alloc->size-pos,*dci_pdu);
+#endif
+
// HARQ process number 4bit
pos+=4;
- *dci_pdu |= ((pdu_rel15->harq_pid&0xf)<<(dci_alloc->size-pos));
-
+ *dci_pdu |= ((pdu_rel15->harq_pid&0xf)<<(dci_alloc->size-pos));
+#ifdef DEBUG_FILL_DCI
+ printf("HARQ_PID %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->harq_pid,4,dci_alloc->size-pos,*dci_pdu);
+#endif
+
// Downlink assignment index 2bit
pos+=2;
*dci_pdu |= ((pdu_rel15->dai&3)<<(dci_alloc->size-pos));
+#ifdef DEBUG_FILL_DCI
+ printf("DAI %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->dai,2,dci_alloc->size-pos,*dci_pdu);
+#endif
// TPC command for scheduled PUCCH 2bit
pos+=2;
- *dci_pdu |= ((pdu_rel15->tpc&3)<<(dci_alloc->size-pos));
+ *dci_pdu |= ((pdu_rel15->tpc&3)<<(dci_alloc->size-pos));
+#ifdef DEBUG_FILL_DCI
+ printf("TPC %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->tpc,2,dci_alloc->size-pos,*dci_pdu);
+#endif
// PUCCH resource indicator 3bit
pos+=3;
- *dci_pdu |= ((pdu_rel15->pucch_resource_indicator&0x7)<<(dci_alloc->size-pos));
+ *dci_pdu |= ((pdu_rel15->pucch_resource_indicator&0x7)<<(dci_alloc->size-pos));
+#ifdef DEBUG_FILL_DCI
+ printf("PUCCH RI %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->pucch_resource_indicator,3,dci_alloc->size-pos,*dci_pdu);
+#endif
// PDSCH-to-HARQ_feedback timing indicator 3bit
pos+=3;
- *dci_pdu |= ((pdu_rel15->pdsch_to_harq_feedback_timing_indicator&0x7)<<(dci_alloc->size-pos));
+ *dci_pdu |= ((pdu_rel15->pdsch_to_harq_feedback_timing_indicator&0x7)<<(dci_alloc->size-pos));
+#ifdef DEBUG_FILL_DCI
+ printf("PDSCH to HARQ TI %d (%d bits)=> %d (0x%lx)\n",pdu_rel15->pdsch_to_harq_feedback_timing_indicator,3,dci_alloc->size-pos,*dci_pdu);
+#endif
} //end else
break;
@@ -269,26 +324,26 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
// Short Messages Indicator – 2 bits
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->short_messages_indicator>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->short_messages_indicator>>(1-i))&1)<<(dci_alloc->size-pos++);
// Short Messages – 8 bits
for (int i=0; i<8; i++)
- *dci_pdu |= ((pdu_rel15->short_messages>>(7-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->short_messages>>(7-i))&1)<<(dci_alloc->size-pos++);
// Freq domain assignment 0-16 bit
fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
for (int i=0; ifrequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
// Time domain assignment 4 bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
// VRB to PRB mapping 1 bit
- *dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos++);
// MCS 5 bit
for (int i=0; i<5; i++)
- *dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
-
+ *dci_pdu |= (((uint64_t)pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
+
// TB scaling 2 bit
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->tb_scaling>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->tb_scaling>>(1-i))&1)<<(dci_alloc->size-pos++);
break;
@@ -300,49 +355,49 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
*dci_pdu |= ((pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
// Time domain assignment 4 bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
// VRB to PRB mapping 1 bit
- *dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos++);
// MCS 5bit //bit over 32, so dci_pdu ++
for (int i=0; i<5; i++)
- *dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
// Redundancy version 2bit
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
break;
case NFAPI_NR_RNTI_TC:
// indicating a DL DCI format 1bit
- *dci_pdu |= (pdu_rel15->format_indicator&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->format_indicator&1)<<(dci_alloc->size-pos++);
// Freq domain assignment 0-16 bit
fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
for (int i=0; ifrequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
// Time domain assignment 4 bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
// VRB to PRB mapping 1 bit
- *dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos++);
// MCS 5bit //bit over 32, so dci_pdu ++
for (int i=0; i<5; i++)
- *dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
// New data indicator 1bit
- *dci_pdu |= (pdu_rel15->ndi&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->ndi&1)<<(dci_alloc->size-pos++);
// Redundancy version 2bit
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
// HARQ process number 4bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->harq_pid>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->harq_pid>>(3-i))&1)<<(dci_alloc->size-pos++);
- // Downlink assignment index – 2 bits
+ // Downlink assignment index – 2 bits
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->dai>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->dai>>(1-i))&1)<<(dci_alloc->size-pos++);
// TPC command for scheduled PUCCH – 2 bits
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->tpc>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->tpc>>(1-i))&1)<<(dci_alloc->size-pos++);
// LOG_I(PHY, "DCI PDU: [0]->0x%08llx \t [1]->0x%08llx \t [2]->0x%08llx \t [3]->0x%08llx\n",
@@ -351,49 +406,50 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
// PDSCH-to-HARQ_feedback timing indicator – 3 bits
for (int i=0; i<3; i++)
- *dci_pdu |= ((pdu_rel15->pdsch_to_harq_feedback_timing_indicator>>(2-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->pdsch_to_harq_feedback_timing_indicator>>(2-i))&1)<<(dci_alloc->size-pos++);
break;
}
+ break;
case NFAPI_NR_UL_DCI_FORMAT_0_0:
switch(params_rel15->rnti_type)
{
case NFAPI_NR_RNTI_C:
// indicating a DL DCI format 1bit
- *dci_pdu |= (pdu_rel15->format_indicator&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->format_indicator&1)<<(dci_alloc->size-pos++);
// Freq domain assignment max 16 bit
fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
for (int i=0; ifrequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
// Time domain assignment 4bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
// Frequency hopping flag – 1 bit
- *dci_pdu |= (pdu_rel15->frequency_hopping_flag&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->frequency_hopping_flag&1)<<(dci_alloc->size-pos++);
// MCS 5 bit
for (int i=0; i<5; i++)
- *dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
// New data indicator 1bit
- *dci_pdu |= (pdu_rel15->ndi&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->ndi&1)<<(dci_alloc->size-pos++);
// Redundancy version 2bit
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
// HARQ process number 4bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->harq_pid>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->harq_pid>>(3-i))&1)<<(dci_alloc->size-pos++);
// TPC command for scheduled PUSCH – 2 bits
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->tpc>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->tpc>>(1-i))&1)<<(dci_alloc->size-pos++);
// Padding bits
for(int a = pos;a<32;a++)
- *dci_pdu |= (pdu_rel15->padding&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->padding&1)<<(dci_alloc->size-pos++);
// UL/SUL indicator – 1 bit
if (cfg->pucch_config.pucch_GroupHopping.value)
- *dci_pdu |= (pdu_rel15->ul_sul_indicator&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->ul_sul_indicator&1)<<(dci_alloc->size-pos++);
break;
@@ -407,39 +463,39 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
*dci_pdu |= ((pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
// Time domain assignment 4bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
// Frequency hopping flag – 1 bit
- *dci_pdu |= (pdu_rel15->frequency_hopping_flag&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->frequency_hopping_flag&1)<<(dci_alloc->size-pos++);
// MCS 5 bit
for (int i=0; i<5; i++)
- *dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
// New data indicator 1bit
- *dci_pdu |= (pdu_rel15->ndi&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->ndi&1)<<(dci_alloc->size-pos++);
// Redundancy version 2bit
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->rv>>(1-i))&1)<<(dci_alloc->size-pos++);
// HARQ process number 4bit
for (int i=0; i<4; i++)
- *dci_pdu |= ((pdu_rel15->harq_pid>>(3-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->harq_pid>>(3-i))&1)<<(dci_alloc->size-pos++);
// TPC command for scheduled PUSCH – 2 bits
for (int i=0; i<2; i++)
- *dci_pdu |= ((pdu_rel15->tpc>>(1-i))&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= (((uint64_t)pdu_rel15->tpc>>(1-i))&1)<<(dci_alloc->size-pos++);
// Padding bits
for(int a = pos;a<32;a++)
- *dci_pdu |= (pdu_rel15->padding&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->padding&1)<<(dci_alloc->size-pos++);
// UL/SUL indicator – 1 bit
if (cfg->pucch_config.pucch_GroupHopping.value)
- *dci_pdu |= (pdu_rel15->ul_sul_indicator&1)<<(dci_alloc->size-pos++);
+ *dci_pdu |= ((uint64_t)pdu_rel15->ul_sul_indicator&1)<<(dci_alloc->size-pos++);
break;
}
break;
}
- LOG_I(PHY, "DCI PDU: [0]->0x%16llxx \t [1]->0x%16llx \n",(long long unsigned int)dci_pdu[0], (long long unsigned int)dci_pdu[1]);
+ LOG_I(PHY, "DCI PDU: [0]->0x%lx \t [1]->0x%lx \n",dci_pdu[0], dci_pdu[1]);
LOG_I(PHY, "DCI type %d payload (size %d) generated on candidate %d\n", dci_alloc->pdcch_params.dci_format, dci_alloc->size, cand_idx);
/// DLSCH struct
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index b65b48c39e..eb2e11fec4 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -338,11 +338,9 @@ ap, Wt[0], Wt[1], Wf[0], Wf[1], delta, l_prime[0], l0, dmrs_symbol);
for (int l=rel15->start_symbol; lstart_symbol+rel15->nb_symbols; l++) {
k = start_sc;
for (int i=0; in_prb*NR_NB_SC_PER_RB; i++) {
-// Note the dmrs index modulo 2048 only works for that symbol size -- to be fixed soon
-// Also the different amplitudes are for debug purposes and temporary
- if ((l == dmrs_symbol) && (k == ((start_sc+get_pdsch_dmrs_idx(n, k_prime, delta, dmrs_type))&((1<<11)-1)))) {
- ((int16_t*)txdataF[ap])[(l*frame_parms.ofdm_symbol_size + k)<<1] = (Wt[l_prime[0]]*Wf[k_prime]*(amp>>1)*mod_dmrs[dmrs_idx<<1]) >> 15;
- ((int16_t*)txdataF[ap])[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = (Wt[l_prime[0]]*Wf[k_prime]*(amp>>1)*mod_dmrs[(dmrs_idx<<1) + 1]) >> 15;
+ if ((l == dmrs_symbol) && (k == ((start_sc+get_pdsch_dmrs_idx(n, k_prime, delta, dmrs_type))%(frame_parms.ofdm_symbol_size)))) {
+ ((int16_t*)txdataF[ap])[(l*frame_parms.ofdm_symbol_size + k)<<1] = (Wt[l_prime[0]]*Wf[k_prime]*amp*mod_dmrs[dmrs_idx<<1]) >> 15;
+ ((int16_t*)txdataF[ap])[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = (Wt[l_prime[0]]*Wf[k_prime]*amp*mod_dmrs[(dmrs_idx<<1) + 1]) >> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("dmrs_idx %d\t l %d \t k %d \t k_prime %d \t n %d \t txdataF: %d %d\n",
dmrs_idx, l, k, k_prime, n, ((int16_t*)txdataF[ap])[(l*frame_parms.ofdm_symbol_size + k)<<1],
@@ -356,8 +354,8 @@ dmrs_idx, l, k, k_prime, n, ((int16_t*)txdataF[ap])[(l*frame_parms.ofdm_symbol_s
else {
- ((int16_t*)txdataF[ap])[(l*frame_parms.ofdm_symbol_size + k)<<1] = ((amp<<1) * tx_layers[ap][m<<1]) >> 15;
- ((int16_t*)txdataF[ap])[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = ((amp<<1) * tx_layers[ap][(m<<1) + 1]) >> 15;
+ ((int16_t*)txdataF[ap])[(l*frame_parms.ofdm_symbol_size + k)<<1] = (amp * tx_layers[ap][m<<1]) >> 15;
+ ((int16_t*)txdataF[ap])[((l*frame_parms.ofdm_symbol_size + k)<<1) + 1] = (amp * tx_layers[ap][(m<<1) + 1]) >> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("m %d\t l %d \t k %d \t txdataF: %d %d\n",
m, l, k, ((int16_t*)txdataF[ap])[(l*frame_parms.ofdm_symbol_size + k)<<1],
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.h b/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
index 205eae7f8e..06969eded0 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
@@ -90,6 +90,8 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
@param nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs */
uint32_t nr_get_G(uint16_t nb_rb, uint16_t nb_symb_sch,uint8_t nb_re_dmrs,uint16_t length_dmrs,uint8_t Qm, uint8_t Nl);
+uint32_t nr_get_E(uint32_t G, uint8_t C, uint8_t Qm, uint8_t Nl, uint8_t r);
+
void free_gNB_dlsch(NR_gNB_DLSCH_t *dlsch);
void clean_gNB_dlsch(NR_gNB_DLSCH_t *dlsch);
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 0d59207480..8a2877cc17 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -280,7 +280,7 @@ int nr_dlsch_encoding(unsigned char *a,
uint32_t A, Z;
uint32_t *pz = &Z;
uint8_t mod_order = rel15.modulation_order;
- uint16_t Kr=0,r,r_offset=0;//Kr_bytes
+ uint16_t Kr=0,r,r_offset=0,Kr_bytes;
uint8_t *d_tmp[MAX_NUM_DLSCH_SEGMENTS];
uint8_t kb,BG=1;
uint32_t E;
@@ -346,7 +346,7 @@ int nr_dlsch_encoding(unsigned char *a,
}
Kr = dlsch->harq_processes[harq_pid]->K;
- //Kr_bytes = Kr>>3;
+ Kr_bytes = Kr>>3;
//printf("segment Z %d kb %d k %d Kr %d BG %d\n", *pz,kb,dlsch->harq_processes[harq_pid]->K,Kr,BG);
@@ -403,25 +403,24 @@ int nr_dlsch_encoding(unsigned char *a,
//start_meas(rm_stats);
#ifdef DEBUG_DLSCH_CODING
- printf("rvidx in encoding = %d\n", dlsch->harq_processes[harq_pid]->rvidx);
+ printf("rvidx in encoding = %d\n", rel15.redundancy_version);
#endif
- E = nr_rate_matching_ldpc(Ilbrm,
- Tbslbrm,
- BG,
- *pz,
- G,
- dlsch->harq_processes[harq_pid]->d[r],
- dlsch->harq_processes[harq_pid]->e+r_offset,
- dlsch->harq_processes[harq_pid]->C,
- rel15.redundancy_version,
- mod_order,
- rel15.nb_layers,
- r);
+ E = nr_get_E(G, dlsch->harq_processes[harq_pid]->C, mod_order, rel15.nb_layers, r);
+
+ nr_rate_matching_ldpc(Ilbrm,
+ Tbslbrm,
+ BG,
+ *pz,
+ dlsch->harq_processes[harq_pid]->d[r],
+ dlsch->harq_processes[harq_pid]->e+r_offset,
+ dlsch->harq_processes[harq_pid]->C,
+ rel15.redundancy_version,
+ E);
#ifdef DEBUG_DLSCH_CODING
for (int i =0; i<16; i++)
- printf("output ratematching e[%d]= %d r_offset %d\n", i,dlsch->harq_processes[harq_pid]->e[i], r_offset);
+ printf("output ratematching e[%d]= %d r_offset %d\n", i,dlsch->harq_processes[harq_pid]->e[i+r_offset], r_offset);
#endif
//stop_meas(rm_stats);
@@ -432,18 +431,15 @@ int nr_dlsch_encoding(unsigned char *a,
dlsch->harq_processes[harq_pid]->f+r_offset);
//stop_meas(i_stats);
- r_offset += E;
#ifdef DEBUG_DLSCH_CODING
for (int i =0; i<16; i++)
- printf("output interleaving f[%d]= %d r_offset %d\n", i,dlsch->harq_processes[harq_pid]->f[i+r*r_offset], r_offset);
-#endif
-
-#ifdef DEBUG_DLSCH_CODING
+ printf("output interleaving f[%d]= %d r_offset %d\n", i,dlsch->harq_processes[harq_pid]->f[i+r_offset], r_offset);
if (r==dlsch->harq_processes[harq_pid]->C-1)
- write_output("enc_output.m","enc",dlsch->harq_processes[harq_pid]->f,r_offset,1,4);
-
+ write_output("enc_output.m","enc",dlsch->harq_processes[harq_pid]->f,G,1,4);
#endif
+
+ r_offset += E;
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_OUT);
diff --git a/openair1/PHY/NR_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
index 3b81aae04e..ead8e3cda5 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
@@ -43,21 +43,20 @@
extern short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT];
uint8_t nr_pbch_payload_interleaving_pattern[32] = {16, 23, 18, 17, 8, 30, 10, 6, 24, 7, 0, 5, 3, 2, 1, 4,
- 9, 11, 12, 13, 14, 15, 19, 20, 21, 22, 25, 26, 27, 28, 29, 31};
+ 9, 11, 12, 13, 14, 15, 19, 20, 21, 22, 25, 26, 27, 28, 29, 31
+ };
int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
int32_t *txdataF,
int16_t amp,
uint8_t ssb_start_symbol,
- nfapi_nr_config_request_t* config,
- NR_DL_FRAME_PARMS *frame_parms)
-{
+ nfapi_nr_config_request_t *config,
+ NR_DL_FRAME_PARMS *frame_parms) {
int k,l;
//int16_t a;
int16_t mod_dmrs[NR_PBCH_DMRS_LENGTH<<1];
uint8_t idx=0;
uint8_t nushift = config->sch_config.physical_cell_id.value &3;
-
LOG_D(PHY, "PBCH DMRS mapping started at symbol %d shift %d\n", ssb_start_symbol+1, nushift);
/// QPSK modulation
@@ -66,79 +65,75 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
mod_dmrs[m<<1] = nr_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
mod_dmrs[(m<<1)+1] = nr_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];
#ifdef DEBUG_PBCH_DMRS
- printf("m %d idx %d gold seq %d b0-b1 %d-%d mod_dmrs %d %d\n", m, idx, gold_pbch_dmrs[(m<<1)>>5], (((gold_pbch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1),
- (((gold_pbch_dmrs[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1), mod_dmrs[(m<<1)], mod_dmrs[(m<<1)+1]);
+ printf("m %d idx %d gold seq %d b0-b1 %d-%d mod_dmrs %d %d\n", m, idx, gold_pbch_dmrs[(m<<1)>>5], (((gold_pbch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1),
+ (((gold_pbch_dmrs[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1), mod_dmrs[(m<<1)], mod_dmrs[(m<<1)+1]);
#endif
}
/// Resource mapping
+ // PBCH DMRS are mapped within the SSB block on every fourth subcarrier starting from nushift of symbols 1, 2, 3
+ ///symbol 1 [0+nushift:4:236+nushift] -- 60 mod symbols
+ k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nushift;
+ l = ssb_start_symbol + 1;
-
- // PBCH DMRS are mapped within the SSB block on every fourth subcarrier starting from nushift of symbols 1, 2, 3
- ///symbol 1 [0+nushift:4:236+nushift] -- 60 mod symbols
- k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nushift;
- l = ssb_start_symbol + 1;
-
- for (int m = 0; m < 60; m++) {
+ for (int m = 0; m < 60; m++) {
#ifdef DEBUG_PBCH_DMRS
- printf("m %d at k %d of l %d\n", m, k, l);
+ printf("m %d at k %d of l %d\n", m, k, l);
#endif
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_dmrs[m<<1]) >> 15;
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[(m<<1) + 1]) >> 15;
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_dmrs[m<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[(m<<1) + 1]) >> 15;
#ifdef DEBUG_PBCH_DMRS
- printf("(%d,%d)\n",
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1],
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1)+1]);
+ printf("(%d,%d)\n",
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1],
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1)+1]);
#endif
- k+=4;
+ k+=4;
- if (k >= frame_parms->ofdm_symbol_size)
- k-=frame_parms->ofdm_symbol_size;
- }
+ if (k >= frame_parms->ofdm_symbol_size)
+ k-=frame_parms->ofdm_symbol_size;
+ }
- ///symbol 2 [0+u:4:44+nushift ; 192+nu:4:236+nushift] -- 24 mod symbols
- k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nushift;
- l++;
+ ///symbol 2 [0+u:4:44+nushift ; 192+nu:4:236+nushift] -- 24 mod symbols
+ k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nushift;
+ l++;
- for (int m = 60; m < 84; m++) {
+ for (int m = 60; m < 84; m++) {
#ifdef DEBUG_PBCH_DMRS
- printf("m %d at k %d of l %d\n", m, k, l);
+ printf("m %d at k %d of l %d\n", m, k, l);
#endif
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_dmrs[m<<1]) >> 15;
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[(m<<1) + 1]) >> 15;
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_dmrs[m<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[(m<<1) + 1]) >> 15;
#ifdef DEBUG_PBCH_DMRS
- printf("(%d,%d)\n",
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1],
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1)+1]);
+ printf("(%d,%d)\n",
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1],
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1)+1]);
#endif
- k+=(m==71)?148:4; // Jump from 44+nu to 192+nu
+ k+=(m==71)?148:4; // Jump from 44+nu to 192+nu
- if (k >= frame_parms->ofdm_symbol_size)
- k-=frame_parms->ofdm_symbol_size;
- }
+ if (k >= frame_parms->ofdm_symbol_size)
+ k-=frame_parms->ofdm_symbol_size;
+ }
- ///symbol 3 [0+nushift:4:236+nushift] -- 60 mod symbols
- k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nushift;
- l++;
+ ///symbol 3 [0+nushift:4:236+nushift] -- 60 mod symbols
+ k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nushift;
+ l++;
- for (int m = 84; m < NR_PBCH_DMRS_LENGTH; m++) {
+ for (int m = 84; m < NR_PBCH_DMRS_LENGTH; m++) {
#ifdef DEBUG_PBCH_DMRS
- printf("m %d at k %d of l %d\n", m, k, l);
+ printf("m %d at k %d of l %d\n", m, k, l);
#endif
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_dmrs[m<<1]) >> 15;
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[(m<<1) + 1]) >> 15;
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_dmrs[m<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_dmrs[(m<<1) + 1]) >> 15;
#ifdef DEBUG_PBCH_DMRS
- printf("(%d,%d)\n",
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1],
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1)+1]);
+ printf("(%d,%d)\n",
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1],
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1)+1]);
#endif
- k+=4;
-
- if (k >= frame_parms->ofdm_symbol_size)
- k-=frame_parms->ofdm_symbol_size;
- }
-
+ k+=4;
+ if (k >= frame_parms->ofdm_symbol_size)
+ k-=frame_parms->ofdm_symbol_size;
+ }
#ifdef DEBUG_PBCH_DMRS
write_output("txdataF_pbch_dmrs.m", "txdataF_pbch_dmrs", txdataF[0], frame_parms->samples_per_frame_wCP>>1, 1, 1);
@@ -186,6 +181,7 @@ void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
s = lte_gold_generic(&x1, &x2, reset);
reset = 0;
}
+
pbch->pbch_a_prime ^= (((pbch->pbch_a_interleaved>>i)&1) ^ ((s>>((k+offset)&0x1f))&1))<pbch_a=0;
+
for (int i=0; ipbch_a |= ((pbch_pdu[2-(i>>3)]>>(7-(i&7)))&1)<pbch_a);
#endif
- // Extra byte generation
+ // Extra byte generation
for (int i=0; i<4; i++)
pbch->pbch_a |= ((sfn>>(3-i))&1)<<(24+i); // resp. 4th, 3rd, 2nd ans 1st lsb of sfn
@@ -276,12 +269,12 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
LOG_I(PHY,"After extra byte: pbch_a = 0x%08x\n",pbch->pbch_a);
- // Payload interleaving
-
+ // Payload interleaving
+
for (int i=0; ipbch_a_interleaved |= ((pbch->pbch_a>>i)&1)<<(*(interleaver+i));
#ifdef DEBUG_PBCH_ENCODING
- printf("i %d out 0x%08x ilv %d (in>>i)&1) %d\n", i, pbch->pbch_a_interleaved, *(interleaver+i), (pbch->pbch_a>>i)&1);
+ printf("i %d out 0x%08x ilv %d (in>>i)&1) %d\n", i, pbch->pbch_a_interleaved, *(interleaver+i), (pbch->pbch_a>>i)&1);
#endif
}
@@ -289,8 +282,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
printf("Interleaving:\n");
printf("pbch_a_interleaved: 0x%08x\n", pbch->pbch_a_interleaved);
#endif
-
- // Scrambling
+ // Scrambling
unscrambling_mask = (Lmax ==64)? 0x100006D:0x1000041;
M = (Lmax == 64)? (NR_POLAR_PBCH_PAYLOAD_BITS - 6) : (NR_POLAR_PBCH_PAYLOAD_BITS - 3);
nushift = (((sfn>>2)&1)<<1) ^ ((sfn>>1)&1);
@@ -301,147 +293,143 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
printf("pbch_a_prime: 0x%08x\n", pbch->pbch_a_prime);
#endif
-// Encoder reversal
+ // Encoder reversal
for (int i=0; ipbch_a_prime>>i)&1)<<(31-i);
-
/// CRC, coding and rate matching
- polar_encoder_fast (&a_reversed, (uint32_t*)pbch->pbch_e, 0, polar_params);
+ polar_encoder_fast (&a_reversed, (uint32_t *)pbch->pbch_e, 0,
+ nr_polar_params( NR_POLAR_PBCH_MESSAGE_TYPE, NR_POLAR_PBCH_PAYLOAD_BITS, NR_POLAR_PBCH_AGGREGATION_LEVEL)
+ );
#ifdef DEBUG_PBCH_ENCODING
printf("Channel coding:\n");
+
for (int i=0; ipbch_e[i]);
+
printf("\n");
#endif
-
/// Scrambling
M = NR_POLAR_PBCH_E;
nushift = (Lmax==4)? ssb_index&3 : ssb_index&7;
nr_pbch_scrambling(pbch, (uint32_t)config->sch_config.physical_cell_id.value, nushift, M, NR_POLAR_PBCH_E, 1, 0);
#ifdef DEBUG_PBCH_ENCODING
printf("Scrambling:\n");
+
for (int i=0; ipbch_e[i]);
+
printf("\n");
#endif
/// QPSK modulation
- for (int i=0; i>1; i++){
+ for (int i=0; i>1; i++) {
idx = (((pbch->pbch_e[(i<<1)>>5]>>((i<<1)&0x1f))&1)<<1) ^ ((pbch->pbch_e[((i<<1)+1)>>5]>>(((i<<1)+1)&0x1f))&1);
mod_pbch_e[i<<1] = nr_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
mod_pbch_e[(i<<1)+1] = nr_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1)+1];
-
#ifdef DEBUG_PBCH
- printf("i %d idx %d mod_pbch %d %d\n", i, idx, mod_pbch_e[2*i], mod_pbch_e[2*i+1]);
+ printf("i %d idx %d mod_pbch %d %d\n", i, idx, mod_pbch_e[2*i], mod_pbch_e[2*i+1]);
#endif
}
/// Resource mapping
nushift = config->sch_config.physical_cell_id.value &3;
+ // PBCH modulated symbols are mapped within the SSB block on symbols 1, 2, 3 excluding the subcarriers used for the PBCH DMRS
+ ///symbol 1 [0:239] -- 180 mod symbols
+ k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier;
+ l = ssb_start_symbol + 1;
+ m = 0;
-
- // PBCH modulated symbols are mapped within the SSB block on symbols 1, 2, 3 excluding the subcarriers used for the PBCH DMRS
- ///symbol 1 [0:239] -- 180 mod symbols
- k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier;
- l = ssb_start_symbol + 1;
- m = 0;
-
- for (int ssb_sc_idx = 0; ssb_sc_idx < 240; ssb_sc_idx++) {
-
- if ((ssb_sc_idx&3) == nushift) { //skip DMRS
- k++;
- continue;
- }
- else {
+ for (int ssb_sc_idx = 0; ssb_sc_idx < 240; ssb_sc_idx++) {
+ if ((ssb_sc_idx&3) == nushift) { //skip DMRS
+ k++;
+ continue;
+ } else {
#ifdef DEBUG_PBCH
- printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
+ printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
#endif
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
- k++;
- m++;
- }
-
- if (k >= frame_parms->ofdm_symbol_size)
- k-=frame_parms->ofdm_symbol_size;
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
+ k++;
+ m++;
}
- ///symbol 2 [0:47 ; 192:239] -- 72 mod symbols
- k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier;
- l++;
- m=180;
-
- for (int ssb_sc_idx = 0; ssb_sc_idx < 48; ssb_sc_idx++) {
-
- if ((ssb_sc_idx&3) == nushift) {
- k++;
- continue;
- }
- else {
-#ifdef DEBUG_PBCH
- printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
-#endif
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
- k++;
- m++;
- }
-
- if (k >= frame_parms->ofdm_symbol_size)
- k-=frame_parms->ofdm_symbol_size;
- }
-
- k += 144;
if (k >= frame_parms->ofdm_symbol_size)
k-=frame_parms->ofdm_symbol_size;
+ }
- m=216;
+ ///symbol 2 [0:47 ; 192:239] -- 72 mod symbols
+ k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier;
+ l++;
+ m=180;
- for (int ssb_sc_idx = 192; ssb_sc_idx < 240; ssb_sc_idx++) {
-
- if ((ssb_sc_idx&3) == nushift) {
- k++;
- continue;
- }
- else {
+ for (int ssb_sc_idx = 0; ssb_sc_idx < 48; ssb_sc_idx++) {
+ if ((ssb_sc_idx&3) == nushift) {
+ k++;
+ continue;
+ } else {
#ifdef DEBUG_PBCH
- printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
+ printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
#endif
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
- k++;
- m++;
- }
-
- if (k >= frame_parms->ofdm_symbol_size)
- k-=frame_parms->ofdm_symbol_size;
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
+ k++;
+ m++;
}
- ///symbol 3 [0:239] -- 180 mod symbols
- k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier;
- l++;
- m=252;
+ if (k >= frame_parms->ofdm_symbol_size)
+ k-=frame_parms->ofdm_symbol_size;
+ }
- for (int ssb_sc_idx = 0; ssb_sc_idx < 240; ssb_sc_idx++) {
+ k += 144;
- if ((ssb_sc_idx&3) == nushift) {
- k++;
- continue;
- }
- else {
+ if (k >= frame_parms->ofdm_symbol_size)
+ k-=frame_parms->ofdm_symbol_size;
+
+ m=216;
+
+ for (int ssb_sc_idx = 192; ssb_sc_idx < 240; ssb_sc_idx++) {
+ if ((ssb_sc_idx&3) == nushift) {
+ k++;
+ continue;
+ } else {
#ifdef DEBUG_PBCH
- printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
+ printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
#endif
- ((int16_t*)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
- ((int16_t*)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
- k++;
- m++;
- }
-
- if (k >= frame_parms->ofdm_symbol_size)
- k-=frame_parms->ofdm_symbol_size;
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
+ k++;
+ m++;
}
+ if (k >= frame_parms->ofdm_symbol_size)
+ k-=frame_parms->ofdm_symbol_size;
+ }
+
+ ///symbol 3 [0:239] -- 180 mod symbols
+ k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier;
+ l++;
+ m=252;
+
+ for (int ssb_sc_idx = 0; ssb_sc_idx < 240; ssb_sc_idx++) {
+ if ((ssb_sc_idx&3) == nushift) {
+ k++;
+ continue;
+ } else {
+#ifdef DEBUG_PBCH
+ printf("m %d ssb_sc_idx %d at k %d of l %d\n", m, ssb_sc_idx, k, l);
+#endif
+ ((int16_t *)txdataF)[(l*frame_parms->ofdm_symbol_size + k)<<1] = (amp * mod_pbch_e[m<<1]) >> 15;
+ ((int16_t *)txdataF)[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * mod_pbch_e[(m<<1) + 1]) >> 15;
+ k++;
+ m++;
+ }
+
+
+ if (k >= frame_parms->ofdm_symbol_size)
+ k-=frame_parms->ofdm_symbol_size;
+ }
+
+
return 0;
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c b/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
index 0b8ab56329..f8b7454067 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
@@ -176,3 +176,18 @@ uint32_t nr_get_G(uint16_t nb_rb, uint16_t nb_symb_sch,uint8_t nb_re_dmrs,uint16
G = ((NR_NB_SC_PER_RB*nb_symb_sch)-(nb_re_dmrs*length_dmrs))*nb_rb*Qm*Nl;
return(G);
}
+
+uint32_t nr_get_E(uint32_t G, uint8_t C, uint8_t Qm, uint8_t Nl, uint8_t r) {
+ uint32_t E;
+ uint8_t Cprime = C; //assume CBGTI not present
+
+ AssertFatal(Nl>0,"Nl is 0\n");
+ AssertFatal(Qm>0,"Qm is 0\n");
+
+ if (r <= Cprime - ((G/(Nl*Qm))%Cprime) - 1)
+ E = Nl*Qm*(G/(Nl*Qm*Cprime));
+ else
+ E = Nl*Qm*((G/(Nl*Qm*Cprime))+1);
+
+ return E;
+}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_transport.h b/openair1/PHY/NR_TRANSPORT/nr_transport.h
index c1a4052191..23413f591c 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_transport.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_transport.h
@@ -36,7 +36,7 @@ int nr_generate_pss( int16_t *d_pss,
int32_t *txdataF,
int16_t amp,
uint8_t ssb_start_symbol,
- nfapi_nr_config_request_t* config,
+ nfapi_nr_config_request_t *config,
NR_DL_FRAME_PARMS *frame_parms);
/*!
@@ -49,7 +49,7 @@ int nr_generate_sss( int16_t *d_sss,
int32_t *txdataF,
int16_t amp,
uint8_t ssb_start_symbol,
- nfapi_nr_config_request_t* config,
+ nfapi_nr_config_request_t *config,
NR_DL_FRAME_PARMS *frame_parms);
/*!
@@ -62,7 +62,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
int32_t *txdataF,
int16_t amp,
uint8_t ssb_start_symbol,
- nfapi_nr_config_request_t* config,
+ nfapi_nr_config_request_t *config,
NR_DL_FRAME_PARMS *frame_parms);
/*!
@@ -85,7 +85,6 @@ void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
@returns 0 on success
*/
int nr_generate_pbch(NR_gNB_PBCH *pbch,
- t_nrPolar_paramsPtr polar_params,
uint8_t *pbch_pdu,
uint8_t *interleaver,
int32_t *txdataF,
@@ -95,7 +94,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
uint8_t Lmax,
uint8_t ssb_index,
int sfn,
- nfapi_nr_config_request_t* config,
+ nfapi_nr_config_request_t *config,
NR_DL_FRAME_PARMS *frame_parms);
/*!
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
index 942bf8c0ba..a90450b0a5 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
@@ -29,6 +29,7 @@
#include "filt16a_32.h"
#include "T.h"
//#define DEBUG_PDSCH
+//#define DEBUG_PDCCH
int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
@@ -271,8 +272,8 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
//uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
uint8_t nushift;
- int **dl_ch_estimates =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset];
- int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF;
+ int **dl_ch_estimates =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].dl_ch_estimates[eNB_offset];
+ int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].rxdataF;
nushift = 1;
ue->frame_parms.nushift = nushift;
@@ -287,7 +288,7 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
k = coreset_start_subcarrier;
#ifdef DEBUG_PDCCH
- printf("PDCCH Channel Estimation : ThreadId %d, eNB_offset %d ch_offset %d, OFDM size %d, Ncp=%d, l=%d, Ns=%d, k=%d symbol %d\n",ue->current_thread_id[Ns>>1], eNB_offset,ch_offset,ue->frame_parms.ofdm_symbol_size,
+ printf("PDCCH Channel Estimation : ThreadId %d, eNB_offset %d ch_offset %d, OFDM size %d, Ncp=%d, l=%d, Ns=%d, k=%d symbol %d\n",ue->current_thread_id[Ns], eNB_offset,ch_offset,ue->frame_parms.ofdm_symbol_size,
ue->frame_parms.Ncp,l,Ns,k, symbol);
#endif
@@ -459,16 +460,16 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
break;
}
- if( (Ns== 2) && (l == 0))
+ if( (Ns== 1) && (l == 0))
{
// do ifft of channel estimate
for (aarx=0; aarxframe_parms.nb_antennas_rx; aarx++)
for (p=0; pframe_parms.nb_antenna_ports_eNB; p++) {
- if (ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset][(p<<1)+aarx])
+ if (ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].dl_ch_estimates[eNB_offset][(p<<1)+aarx])
{
- LOG_D(PHY,"Channel Impulse Computation Slot %d ThreadId %d Symbol %d \n", Ns, ue->current_thread_id[Ns>>1], l);
- idft((int16_t*) &ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset][(p<<1)+aarx][0],
- (int16_t*) ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates_time[eNB_offset][(p<<1)+aarx],1);
+ LOG_D(PHY,"Channel Impulse Computation Slot %d ThreadId %d Symbol %d \n", Ns, ue->current_thread_id[Ns], l);
+ idft((int16_t*) &ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].dl_ch_estimates[eNB_offset][(p<<1)+aarx][0],
+ (int16_t*) ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].dl_ch_estimates_time[eNB_offset][(p<<1)+aarx],1);
}
}
}
@@ -496,8 +497,8 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
//uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
uint8_t nushift;
- int **dl_ch_estimates =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset];
- int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF;
+ int **dl_ch_estimates =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].dl_ch_estimates[eNB_offset];
+ int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns]].rxdataF;
nushift = (p>>1)&1;
ue->frame_parms.nushift = nushift;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
old mode 100755
new mode 100644
index cf419b0904..6f2f5bcf2d
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -30,9 +30,9 @@
* \warning
*/
#ifdef USER_MODE
-#include
-#include
-#include
+ #include
+ #include
+ #include
#endif
#include "nr_transport_proto_ue.h"
#include "PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h"
@@ -40,7 +40,7 @@
#include "PHY/CODING/coding_extern.h"
#include "PHY/sse_intrin.h"
-#include "assertions.h"
+#include "assertions.h"
#include "T.h"
//#define DEBUG_DCI_ENCODING 1
@@ -56,8 +56,8 @@
#ifdef LOG_I
-#undef LOG_I
-#define LOG_I(A,B...) printf(B)
+ #undef LOG_I
+ #define LOG_I(A,B...) printf(B)
#endif
#ifdef NR_PDCCH_DCI_RUN
@@ -73,16 +73,16 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
uint32_t coreset_nbr_rb,
uint8_t reg_bundle_size_L,
uint8_t coreset_interleaver_size_R,
- uint8_t n_shift){
+ uint8_t n_shift) {
/*
* This function will do demapping and deinterleaving from llr containing demodulated symbols
* Demapping will regroup in REG and bundles
* Deinterleaving will order the bundles
- *
+ *
* In the following example we can see the process. The llr contains the demodulated IQs, but they are not ordered from REG 0,1,2,..
* In e_rx (z) we will order the REG ids and group them into bundles.
* Then we will put the bundles in the correct order as indicated in subclause 7.3.2.2
- *
+ *
llr --------------------------> e_rx (z) ----> e_rx (z)
| ...
| ...
@@ -91,7 +91,7 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
| ...
| REG 5
| REG 2
-
+
| ...
| ...
| REG 25
@@ -99,7 +99,7 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
| ...
| REG 4
| REG 1
-
+
| ...
| ... ... ...
| REG 24 (bundle 7) ... ...
@@ -113,43 +113,47 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
uint16_t bundle_j=0, f_bundle_j=0,f_reg=0;
uint32_t coreset_C=0;
uint16_t index_z, index_llr;
-
int coreset_interleaved = 0;
- if (reg_bundle_size_L!=0){ // interleaving will be done only if reg_bundle_size_L != 0
+
+ if (reg_bundle_size_L!=0) { // interleaving will be done only if reg_bundle_size_L != 0
coreset_interleaved=1;
coreset_C = (uint32_t)((coreset_nbr_rb * coreset_time_dur)/ (coreset_interleaver_size_R*reg_bundle_size_L));
} else {
reg_bundle_size_L=6;
}
- for(int reg=0; reg<((coreset_nbr_rb*coreset_time_dur)); reg++){
- if ((reg%reg_bundle_size_L) == 0){
+ for(int reg=0; reg<((coreset_nbr_rb*coreset_time_dur)); reg++) {
+ if ((reg%reg_bundle_size_L) == 0) {
if (r == coreset_interleaver_size_R) {
r=0;
c++;
}
+
bundle_j = (c*coreset_interleaver_size_R)+r;
f_bundle_j = ((r*coreset_C)+c+n_shift)%((coreset_nbr_rb*coreset_time_dur)/reg_bundle_size_L);
+
if (coreset_interleaved==0) f_bundle_j=bundle_j;
#ifdef NR_PDCCH_DCI_DEBUG
printf("\n\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_demapping_deinterleaving)-> [r=%d,c=%d] bundle_j(%d) interleaved at f_bundle_j(%d)\n",r,c,bundle_j,f_bundle_j);
#endif
}
+
f_reg = (f_bundle_j*reg_bundle_size_L)+(reg%reg_bundle_size_L);
//index_z = 9*reg;
index_z = 9*(uint16_t)floor(reg/coreset_time_dur) + (9*coreset_nbr_rb)*(reg%coreset_time_dur);
//index_llr = 9*(((uint16_t)floor(f_reg/reg_bundle_size_L)+(f_reg)%coreset_time_dur))*(coreset_nbr_rb);
index_llr = 9*((uint16_t)floor(f_reg/coreset_time_dur)+((f_reg%coreset_time_dur)*(coreset_nbr_rb)));
- for (int i=0; i<9; i++){
- z[index_z + i] = llr[index_llr + i];
+ for (int i=0; i<9; i++) {
+ z[index_z + i] = llr[index_llr + i];
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_demapping_deinterleaving)-> [reg=%d,bundle_j=%d] z[%d]=(%d,%d) <-> \t[f_reg=%d,fbundle_j=%d] llr[%d]=(%d,%d) \n",
- reg,bundle_j,(index_z + i),*(int16_t*) &z[index_z + i],*(1 + (int16_t*) &z[index_z + i]),
- f_reg,f_bundle_j,(index_llr + i),*(int16_t*) &llr[index_llr + i], *(1 + (int16_t*) &llr[index_llr + i]));
+ reg,bundle_j,(index_z + i),*(int16_t *) &z[index_z + i],*(1 + (int16_t *) &z[index_z + i]),
+ f_reg,f_bundle_j,(index_llr + i),*(int16_t *) &llr[index_llr + i], *(1 + (int16_t *) &llr[index_llr + i]));
#endif
}
+
if ((reg%reg_bundle_size_L) == 0) r++;
}
}
@@ -158,31 +162,30 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
#ifdef NR_PDCCH_DCI_RUN
int32_t nr_pdcch_llr(NR_DL_FRAME_PARMS *frame_parms, int32_t **rxdataF_comp,
- int16_t *pdcch_llr, uint8_t symbol,uint32_t coreset_nbr_rb) {
-
- int16_t *rxF = (int16_t*) &rxdataF_comp[0][(symbol * coreset_nbr_rb * 12)];
+ int16_t *pdcch_llr, uint8_t symbol,uint32_t coreset_nbr_rb) {
+ int16_t *rxF = (int16_t *) &rxdataF_comp[0][(symbol * coreset_nbr_rb * 12)];
int32_t i;
int16_t *pdcch_llrp;
-
pdcch_llrp = &pdcch_llr[2 * symbol * coreset_nbr_rb * 9];
-
if (!pdcch_llrp) {
printf("pdcch_qpsk_llr: llr is null, symbol %d\n", symbol);
return (-1);
}
+
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_llr)-> llr logs: pdcch qpsk llr for symbol %d (pos %d), llr offset %d\n",symbol,(symbol*frame_parms->N_RB_DL*12),pdcch_llrp-pdcch_llr);
#endif
+
//for (i = 0; i < (frame_parms->N_RB_DL * ((symbol == 0) ? 16 : 24)); i++) {
for (i = 0; i < (coreset_nbr_rb * ((symbol == 0) ? 18 : 18)); i++) {
-
if (*rxF > 31)
*pdcch_llrp = 31;
else if (*rxF < -32)
*pdcch_llrp = -32;
else
*pdcch_llrp = (*rxF);
+
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_llr)-> llr logs: rb=%d i=%d *rxF:%d => *pdcch_llrp:%d\n",i/18,i,*rxF,*pdcch_llrp);
#endif
@@ -191,7 +194,6 @@ int32_t nr_pdcch_llr(NR_DL_FRAME_PARMS *frame_parms, int32_t **rxdataF_comp,
}
return (0);
-
}
#endif
@@ -200,13 +202,10 @@ int32_t nr_pdcch_llr(NR_DL_FRAME_PARMS *frame_parms, int32_t **rxdataF_comp,
int32_t pdcch_llr(NR_DL_FRAME_PARMS *frame_parms,
int32_t **rxdataF_comp,
char *pdcch_llr,
- uint8_t symbol)
-{
-
- int16_t *rxF= (int16_t*) &rxdataF_comp[0][(symbol*frame_parms->N_RB_DL*12)];
+ uint8_t symbol) {
+ int16_t *rxF= (int16_t *) &rxdataF_comp[0][(symbol*frame_parms->N_RB_DL*12)];
int32_t i;
char *pdcch_llr8;
-
pdcch_llr8 = &pdcch_llr[2*symbol*frame_parms->N_RB_DL*12];
if (!pdcch_llr8) {
@@ -217,7 +216,6 @@ int32_t pdcch_llr(NR_DL_FRAME_PARMS *frame_parms,
// printf("pdcch qpsk llr for symbol %d (pos %d), llr offset %d\n",symbol,(symbol*frame_parms->N_RB_DL*12),pdcch_llr8-pdcch_llr);
for (i=0; i<(frame_parms->N_RB_DL*((symbol==0) ? 16 : 24)); i++) {
-
if (*rxF>31)
*pdcch_llr8=31;
else if (*rxF<-32)
@@ -231,7 +229,6 @@ int32_t pdcch_llr(NR_DL_FRAME_PARMS *frame_parms,
}
return(0);
-
}
//__m128i avg128P;
@@ -240,9 +237,7 @@ int32_t pdcch_llr(NR_DL_FRAME_PARMS *frame_parms,
void pdcch_channel_level(int32_t **dl_ch_estimates_ext,
NR_DL_FRAME_PARMS *frame_parms,
int32_t *avg,
- uint8_t nb_rb)
-{
-
+ uint8_t nb_rb) {
int16_t rb;
uint8_t aarx;
#if defined(__x86_64__) || defined(__i386__)
@@ -252,40 +247,38 @@ void pdcch_channel_level(int32_t **dl_ch_estimates_ext,
int16x8_t *dl_ch128;
int32x4_t *avg128P;
#endif
+
for (aarx=0; aarxnb_antennas_rx; aarx++) {
//clear average level
#if defined(__x86_64__) || defined(__i386__)
avg128P = _mm_setzero_si128();
dl_ch128=(__m128i *)&dl_ch_estimates_ext[aarx][0];
#elif defined(__arm__)
-
#endif
+
for (rb=0; rb<(nb_rb*3)>>2; rb++) {
-
#if defined(__x86_64__) || defined(__i386__)
avg128P = _mm_add_epi32(avg128P,_mm_madd_epi16(dl_ch128[0],dl_ch128[0]));
avg128P = _mm_add_epi32(avg128P,_mm_madd_epi16(dl_ch128[1],dl_ch128[1]));
avg128P = _mm_add_epi32(avg128P,_mm_madd_epi16(dl_ch128[2],dl_ch128[2]));
#elif defined(__arm__)
-
#endif
// for (int i=0;i<24;i+=2) printf("pdcch channel re %d (%d,%d)\n",(rb*12)+(i>>1),((int16_t*)dl_ch128)[i],((int16_t*)dl_ch128)[i+1]);
dl_ch128+=3;
/*
- if (rb==0) {
- print_shorts("dl_ch128",&dl_ch128[0]);
- print_shorts("dl_ch128",&dl_ch128[1]);
- print_shorts("dl_ch128",&dl_ch128[2]);
- }
+ if (rb==0) {
+ print_shorts("dl_ch128",&dl_ch128[0]);
+ print_shorts("dl_ch128",&dl_ch128[1]);
+ print_shorts("dl_ch128",&dl_ch128[2]);
+ }
*/
}
-
- DevAssert( nb_rb );
- avg[aarx] = (((int32_t*)&avg128P)[0] +
- ((int32_t*)&avg128P)[1] +
- ((int32_t*)&avg128P)[2] +
- ((int32_t*)&avg128P)[3])/(nb_rb*9);
+ DevAssert( nb_rb );
+ avg[aarx] = (((int32_t *)&avg128P)[0] +
+ ((int32_t *)&avg128P)[1] +
+ ((int32_t *)&avg128P)[2] +
+ ((int32_t *)&avg128P)[3])/(nb_rb*9);
// printf("Channel level : %d\n",avg[(aatx<<1)+aarx]);
}
@@ -293,11 +286,10 @@ void pdcch_channel_level(int32_t **dl_ch_estimates_ext,
_mm_empty();
_m_empty();
#endif
-
}
#if defined(__x86_64) || defined(__i386__)
-__m128i mmtmpPD0,mmtmpPD1,mmtmpPD2,mmtmpPD3;
+ __m128i mmtmpPD0,mmtmpPD1,mmtmpPD2,mmtmpPD3;
#elif defined(__arm__)
#endif
@@ -317,7 +309,6 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
uint64_t coreset_freq_dom,
uint32_t coreset_nbr_rb,
uint32_t n_BWP_start) {
-
/*
* This function is demapping DM-RS PDCCH RE
* Implementing 38.211 Section 7.4.1.3.2 Mapping to physical resources
@@ -335,7 +326,6 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
#define NBR_RE_PER_RB_WITH_DMRS 12
// after removing the 3 DMRS RE, the RB contains 9 RE with PDCCH
#define NBR_RE_PER_RB_WITHOUT_DMRS 9
-
uint16_t c_rb, nb_rb = 0;
// this variable will be incremented by 1 each time a bit set to '0' is found in coreset_freq_dom bitmap
uint16_t offset_discontiguous=0;
@@ -344,21 +334,18 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
int32_t *dl_ch0, *dl_ch0_ext, *rxF, *rxF_ext;
int nushiftmod3 = frame_parms->nushift % 3;
uint8_t symbol_mod;
-
symbol_mod = (symbol >= (7 - frame_parms->Ncp)) ? symbol - (7 - frame_parms->Ncp) : symbol;
c_rb = n_BWP_start; // c_rb is the common resource block: RB within the BWP
#ifdef DEBUG_DCI_DECODING
LOG_I(PHY, "extract_rbs_single: symbol_mod %d\n",symbol_mod);
#endif
-
-
for (aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
- if (high_speed_flag == 1){
+ if (high_speed_flag == 1) {
dl_ch0 = &dl_ch_estimates[aarx][(symbol * (frame_parms->ofdm_symbol_size))];
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> dl_ch0 = &dl_ch_estimates[aarx = (%d)][ (symbol * (frame_parms->ofdm_symbol_size (%d))) = (%d)]\n",
- aarx,frame_parms->ofdm_symbol_size,(symbol * (frame_parms->ofdm_symbol_size)));
+ aarx,frame_parms->ofdm_symbol_size,(symbol * (frame_parms->ofdm_symbol_size)));
#endif
} else {
dl_ch0 = &dl_ch_estimates[aarx][0];
@@ -370,15 +357,14 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
dl_ch0_ext = &dl_ch_estimates_ext[aarx][symbol * (coreset_nbr_rb * NBR_RE_PER_RB_WITH_DMRS)];
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> dl_ch0_ext = &dl_ch_estimates_ext[aarx = (%d)][symbol * (frame_parms->N_RB_DL * 9) = (%d)]\n",
- aarx,symbol * (coreset_nbr_rb * NBR_RE_PER_RB_WITH_DMRS));
+ aarx,symbol * (coreset_nbr_rb * NBR_RE_PER_RB_WITH_DMRS));
#endif
rxF_ext = &rxdataF_ext[aarx][symbol * (coreset_nbr_rb * NBR_RE_PER_RB_WITH_DMRS)];
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> rxF_ext = &rxdataF_ext[aarx = (%d)][symbol * (frame_parms->N_RB_DL * 9) = (%d)]\n",
- aarx,symbol * (coreset_nbr_rb * NBR_RE_PER_RB_WITH_DMRS));
+ aarx,symbol * (coreset_nbr_rb * NBR_RE_PER_RB_WITH_DMRS));
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> (for symbol=%d, aarx=%d), symbol_mod=%d, nushiftmod3=%d \n",symbol,aarx,symbol_mod,nushiftmod3);
#endif
-
/*
* The following for loop handles treatment of PDCCH contained in table rxdataF (in frequency domain)
* In NR the PDCCH IQ symbols are contained within RBs in the CORESET defined by higher layers which is located within the BWP
@@ -396,7 +382,6 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
* then the IQ symbol is going to be found at the position 0+c_rb-N_RB_DL/2 in rxdataF and
* we have to point the pointer at (1+c_rb-N_RB_DL/2) in rxdataF
*/
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> n_BWP_start=%d, coreset_nbr_rb=%d\n",n_BWP_start,coreset_nbr_rb);
#endif
@@ -405,38 +390,42 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
//c_rb_tmp = 0;
if (((c_rb - n_BWP_start) % BIT_TO_NBR_RB_CORESET_FREQ_DOMAIN)==0) {
bitcnt_coreset_freq_dom ++;
- while ((((coreset_freq_dom & 0x1FFFFFFFFFFF) >> (CORESET_FREQ_DOMAIN_BITMAP_SIZE - bitcnt_coreset_freq_dom)) & 0x1)== 0){ // 46 -> 45 is number of bits in coreset_freq_dom
+
+ while ((((coreset_freq_dom & 0x1FFFFFFFFFFF) >> (CORESET_FREQ_DOMAIN_BITMAP_SIZE - bitcnt_coreset_freq_dom)) & 0x1)== 0) { // 46 -> 45 is number of bits in coreset_freq_dom
// next 6 RB are not part of the CORESET within the BWP as bit in coreset_freq_dom is set to 0
bitcnt_coreset_freq_dom ++;
//c_rb_tmp = c_rb_tmp + 6;
c_rb = c_rb + BIT_TO_NBR_RB_CORESET_FREQ_DOMAIN;
offset_discontiguous ++;
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> we entered here as coreset_freq_dom=%lx (bit %d) is 0, coreset_freq_domain is discontiguous\n",coreset_freq_dom,(46 - bitcnt_coreset_freq_dom));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> we entered here as coreset_freq_dom=%lx (bit %d) is 0, coreset_freq_domain is discontiguous\n",coreset_freq_dom,
+ (46 - bitcnt_coreset_freq_dom));
#endif
}
}
- //c_rb = c_rb + c_rb_tmp;
+ //c_rb = c_rb + c_rb_tmp;
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> c_rb=%d\n",c_rb);
#endif
+ rxF=NULL;
+
// first we set initial conditions for pointer to rxdataF depending on the situation of the first RB within the CORESET (c_rb = n_BWP_start)
if ((c_rb < (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) == 0)) {
//if RB to be treated is lower than middle system bandwidth then rxdataF pointed at (offset + c_br + symbol * ofdm_symbol_size): even case
rxF = &rxdataF[aarx][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size)))];
-
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in even case c_rb (%d) is lower than half N_RB_DL -> rxF = &rxdataF[aarx = (%d)][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
- c_rb,aarx,(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in even case c_rb (%d) is lower than half N_RB_DL -> rxF = &rxdataF[aarx = (%d)][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
+ c_rb,aarx,(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))));
#endif
}
+
if ((c_rb >= (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) == 0)) {
// number of RBs is even and c_rb is higher than half system bandwidth (we don't skip DC)
// if these conditions are true the pointer has to be situated at the 1st part of the rxdataF
rxF = &rxdataF[aarx][(12*(c_rb - (frame_parms->N_RB_DL>>1)) + (symbol * (frame_parms->ofdm_symbol_size)))]; // we point at the 1st part of the rxdataF in symbol
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in even case c_rb (%d) is higher than half N_RB_DL (not DC) -> rxF = &rxdataF[aarx = (%d)][(12*(c_rb - (frame_parms->N_RB_DL>>1)) + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in even case c_rb (%d) is higher than half N_RB_DL (not DC) -> rxF = &rxdataF[aarx = (%d)][(12*(c_rb - (frame_parms->N_RB_DL>>1)) + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
c_rb,aarx,(12*(c_rb - (frame_parms->N_RB_DL>>1)) + (symbol * (frame_parms->ofdm_symbol_size))));
#endif
//rxF = &rxdataF[aarx][(1 + 12*(c_rb - (frame_parms->N_RB_DL>>1)) + (symbol * (frame_parms->ofdm_symbol_size)))]; // we point at the 1st part of the rxdataF in symbol
@@ -445,46 +434,47 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
// c_rb,aarx,(1 + 12*(c_rb - (frame_parms->N_RB_DL>>1)) + (symbol * (frame_parms->ofdm_symbol_size))));
//#endif
}
- if ((c_rb < (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) != 0)){
+
+ if ((c_rb < (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) != 0)) {
//if RB to be treated is lower than middle system bandwidth then rxdataF pointed at (offset + c_br + symbol * ofdm_symbol_size): odd case
rxF = &rxdataF[aarx][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size)))];
-
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is lower or equal than half N_RB_DL -> rxF = &rxdataF[aarx = (%d)][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
- c_rb,aarx,(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is lower or equal than half N_RB_DL -> rxF = &rxdataF[aarx = (%d)][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
+ c_rb,aarx,(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))));
#endif
}
- if ((c_rb > (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) != 0)){
+
+ if ((c_rb > (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) != 0)) {
// number of RBs is odd and c_rb is higher than half system bandwidth + 1
// if these conditions are true the pointer has to be situated at the 1st part of the rxdataF just after the first IQ symbols of the RB containing DC
rxF = &rxdataF[aarx][(12*(c_rb - (frame_parms->N_RB_DL>>1)) - 6 + (symbol * (frame_parms->ofdm_symbol_size)))]; // we point at the 1st part of the rxdataF in symbol
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is higher than half N_RB_DL (not DC) -> rxF = &rxdataF[aarx = (%d)][(12*(c_rb - frame_parms->N_RB_DL) - 5 + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
- c_rb,aarx,(12*(c_rb - (frame_parms->N_RB_DL>>1)) - 6 + (symbol * (frame_parms->ofdm_symbol_size))));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is higher than half N_RB_DL (not DC) -> rxF = &rxdataF[aarx = (%d)][(12*(c_rb - frame_parms->N_RB_DL) - 5 + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
+ c_rb,aarx,(12*(c_rb - (frame_parms->N_RB_DL>>1)) - 6 + (symbol * (frame_parms->ofdm_symbol_size))));
#endif
}
- if ((c_rb == (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) != 0)){ // treatment of RB containing the DC
+
+ if ((c_rb == (frame_parms->N_RB_DL >> 1)) && ((frame_parms->N_RB_DL & 1) != 0)) { // treatment of RB containing the DC
// if odd number RBs in system bandwidth and first RB to be treated is higher than middle system bandwidth (around DC)
// we have to treat the RB in two parts: first part from i=0 to 5, the data is at the end of rxdataF (pointing at the end of the table)
rxF = &rxdataF[aarx][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size)))];
-
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is half N_RB_DL + 1 we treat DC case -> rxF = &rxdataF[aarx = (%d)][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
- c_rb,aarx,(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is half N_RB_DL + 1 we treat DC case -> rxF = &rxdataF[aarx = (%d)][(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))) = (%d)]\n",
+ c_rb,aarx,(frame_parms->first_carrier_offset + 12 * c_rb + (symbol * (frame_parms->ofdm_symbol_size))));
#endif
/*if (symbol_mod > 300) { // this if is going to be removed as DM-RS signals are present in all symbols of PDCCH
for (i = 0; i < 6; i++) {
- dl_ch0_ext[i] = dl_ch0[i];
- rxF_ext[i] = rxF[i];
+ dl_ch0_ext[i] = dl_ch0[i];
+ rxF_ext[i] = rxF[i];
}
rxF = &rxdataF[aarx][(symbol * (frame_parms->ofdm_symbol_size))]; // we point at the 1st part of the rxdataF in symbol
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is half N_RB_DL +1 we treat DC case -> rxF = &rxdataF[aarx = (%d)][(symbol * (frame_parms->ofdm_symbol_size)) = (%d)]\n",
- c_rb,aarx,(symbol * (frame_parms->ofdm_symbol_size)));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is half N_RB_DL +1 we treat DC case -> rxF = &rxdataF[aarx = (%d)][(symbol * (frame_parms->ofdm_symbol_size)) = (%d)]\n",
+ c_rb,aarx,(symbol * (frame_parms->ofdm_symbol_size)));
#endif
for (; i < 12; i++) {
- dl_ch0_ext[i] = dl_ch0[i];
- rxF_ext[i] = rxF[(1 + i - 6)];
+ dl_ch0_ext[i] = dl_ch0[i];
+ rxF_ext[i] = rxF[(1 + i - 6)];
}
nb_rb++;
dl_ch0_ext += 12;
@@ -494,6 +484,7 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
c_rb++;
} else {*/
j = 0;
+
for (i = 0; i < 6; i++) { //treating first part of the RB note that i=5 would correspond to DC. We treat it in NR
if ((i != 1) && (i != 5)) {
dl_ch0_ext[j] = dl_ch0[i];
@@ -501,12 +492,14 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
// printf("**extract rb %d, re %d => (%d,%d)\n",rb,i,*(short *)&rxF_ext[j-1],*(1+(short*)&rxF_ext[j-1]));
}
}
+
// then we point at the begining of the symbol part of rxdataF do process second part of RB
rxF = &rxdataF[aarx][((symbol * (frame_parms->ofdm_symbol_size)))]; // we point at the 1st part of the rxdataF in symbol
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is half N_RB_DL +1 we treat DC case -> rxF = &rxdataF[aarx = (%d)][(symbol * (frame_parms->ofdm_symbol_size)) = (%d)]\n",
- c_rb,aarx,(symbol * (frame_parms->ofdm_symbol_size)));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> in odd case c_rb (%d) is half N_RB_DL +1 we treat DC case -> rxF = &rxdataF[aarx = (%d)][(symbol * (frame_parms->ofdm_symbol_size)) = (%d)]\n",
+ c_rb,aarx,(symbol * (frame_parms->ofdm_symbol_size)));
#endif
+
for (; i < 12; i++) {
if ((i != 9)) {
dl_ch0_ext[j] = dl_ch0[i];
@@ -514,35 +507,36 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
// printf("**extract rb %d, re %d => (%d,%d)\n",rb,i,*(short *)&rxF_ext[j-1],*(1+(short*)&rxF_ext[j-1]));
}
}
+
nb_rb++;
dl_ch0_ext += NBR_RE_PER_RB_WITHOUT_DMRS;
rxF_ext += NBR_RE_PER_RB_WITHOUT_DMRS;
dl_ch0 += 12;
- //rxF += 7;
- //c_rb++;
- //n_BWP_start++; // We have to increment this variable here to be consequent in the for loop afterwards
+ //rxF += 7;
+ //c_rb++;
+ //n_BWP_start++; // We have to increment this variable here to be consequent in the for loop afterwards
//}
} else { // treatment of any RB that does not contain the DC
/*if (symbol_mod > 300) {
memcpy(dl_ch0_ext, dl_ch0, 12 * sizeof(int32_t));
for (i = 0; i < 12; i++) {
- rxF_ext[i] = rxF[i];
+ rxF_ext[i] = rxF[i];
}
nb_rb++;
dl_ch0_ext += 12;
rxF_ext += 12;
dl_ch0 += 12;
//rxF += 12;
- } else {*/
+ } else {*/
j = 0;
+
for (i = 0; i < 12; i++) {
if ((i != 1) && (i != 5) && (i != 9)) {
rxF_ext[j] = rxF[i];
-
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> RB[c_rb %d] \t RE[re %d] => rxF_ext[%d]=(%d,%d)\t rxF[%d]=(%d,%d)\n",
- c_rb, i, j, *(short *) &rxF_ext[j],*(1 + (short*) &rxF_ext[j]), i,
- *(short *) &rxF[i], *(1 + (short*) &rxF[i]));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> RB[c_rb %d] \t RE[re %d] => rxF_ext[%d]=(%d,%d)\t rxF[%d]=(%d,%d)\n",
+ c_rb, i, j, *(short *) &rxF_ext[j],*(1 + (short *) &rxF_ext[j]), i,
+ *(short *) &rxF[i], *(1 + (short *) &rxF[i]));
#endif
dl_ch0_ext[j] = dl_ch0[i];
//printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> ch %d => dl_ch0(%d,%d)\n", i, *(short *) &dl_ch0[i], *(1 + (short*) &dl_ch0[i]));
@@ -550,17 +544,18 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
j++;
} else {
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> RB[c_rb %d] \t RE[re %d] => rxF_ext[%d]=(%d,%d)\t rxF[%d]=(%d,%d) \t\t <==> DM-RS PDCCH, this is a pilot symbol\n",
- c_rb, i, j, *(short *) &rxF_ext[j], *(1 + (short*) &rxF_ext[j]), i,
- *(short *) &rxF[i], *(1 + (short*) &rxF[i]));
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> RB[c_rb %d] \t RE[re %d] => rxF_ext[%d]=(%d,%d)\t rxF[%d]=(%d,%d) \t\t <==> DM-RS PDCCH, this is a pilot symbol\n",
+ c_rb, i, j, *(short *) &rxF_ext[j], *(1 + (short *) &rxF_ext[j]), i,
+ *(short *) &rxF[i], *(1 + (short *) &rxF[i]));
#endif
}
}
+
nb_rb++;
dl_ch0_ext += NBR_RE_PER_RB_WITHOUT_DMRS;
rxF_ext += NBR_RE_PER_RB_WITHOUT_DMRS;
dl_ch0 += 12;
- //rxF += 12;
+ //rxF += 12;
//}
}
}
@@ -578,38 +573,31 @@ void nr_pdcch_channel_compensation(int32_t **rxdataF_ext,
NR_DL_FRAME_PARMS *frame_parms,
uint8_t symbol,
uint8_t output_shift,
- uint32_t coreset_nbr_rb)
-{
-
+ uint32_t coreset_nbr_rb) {
uint16_t rb; //,nb_rb=20;
uint8_t aarx;
-
#if defined(__x86_64__) || defined(__i386__)
__m128i mmtmpP0,mmtmpP1,mmtmpP2,mmtmpP3;
#elif defined(__arm__)
int16x8_t mmtmpP0,mmtmpP1,mmtmpP2,mmtmpP3;
#endif
-
#if defined(__x86_64__) || defined(__i386__)
__m128i *dl_ch128,*rxdataF128,*rxdataF_comp128;
#elif defined(__arm__)
-
#endif
for (aarx=0; aarxnb_antennas_rx; aarx++) {
-
#if defined(__x86_64__) || defined(__i386__)
dl_ch128 = (__m128i *)&dl_ch_estimates_ext[aarx][symbol*coreset_nbr_rb*12];
rxdataF128 = (__m128i *)&rxdataF_ext[aarx][symbol*coreset_nbr_rb*12];
rxdataF_comp128 = (__m128i *)&rxdataF_comp[aarx][symbol*coreset_nbr_rb*12];
//printf("ch compensation dl_ch ext addr %p \n", &dl_ch_estimates_ext[(aatx<<1)+aarx][symbol*20*12]);
//printf("rxdataf ext addr %p symbol %d\n", &rxdataF_ext[aarx][symbol*20*12], symbol);
- //printf("rxdataf_comp addr %p\n",&rxdataF_comp[(aatx<<1)+aarx][symbol*20*12]);
-
+ //printf("rxdataf_comp addr %p\n",&rxdataF_comp[(aatx<<1)+aarx][symbol*20*12]);
#elif defined(__arm__)
// to be filled in
#endif
-
+
for (rb=0; rb<(coreset_nbr_rb*3)>>2; rb++) {
//printf("rb %d\n",rb);
#if defined(__x86_64__) || defined(__i386__)
@@ -619,7 +607,7 @@ void nr_pdcch_channel_compensation(int32_t **rxdataF_ext,
// mmtmpP0 contains real part of 4 consecutive outputs (32-bit)
mmtmpP1 = _mm_shufflelo_epi16(dl_ch128[0],_MM_SHUFFLE(2,3,0,1));
mmtmpP1 = _mm_shufflehi_epi16(mmtmpP1,_MM_SHUFFLE(2,3,0,1));
- mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i*)&conjugate[0]);
+ mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i *)&conjugate[0]);
// print_ints("im",&mmtmpP1);
mmtmpP1 = _mm_madd_epi16(mmtmpP1,rxdataF128[0]);
// mmtmpP1 contains imag part of 4 consecutive outputs (32-bit)
@@ -635,13 +623,12 @@ void nr_pdcch_channel_compensation(int32_t **rxdataF_ext,
//print_shorts("rx:",rxdataF128);
//print_shorts("ch:",dl_ch128);
//print_shorts("pack:",rxdataF_comp128);
-
// multiply by conjugated channel
mmtmpP0 = _mm_madd_epi16(dl_ch128[1],rxdataF128[1]);
// mmtmpP0 contains real part of 4 consecutive outputs (32-bit)
mmtmpP1 = _mm_shufflelo_epi16(dl_ch128[1],_MM_SHUFFLE(2,3,0,1));
mmtmpP1 = _mm_shufflehi_epi16(mmtmpP1,_MM_SHUFFLE(2,3,0,1));
- mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i*)&conjugate[0]);
+ mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i *)&conjugate[0]);
mmtmpP1 = _mm_madd_epi16(mmtmpP1,rxdataF128[1]);
// mmtmpP1 contains imag part of 4 consecutive outputs (32-bit)
mmtmpP0 = _mm_srai_epi32(mmtmpP0,output_shift);
@@ -652,13 +639,12 @@ void nr_pdcch_channel_compensation(int32_t **rxdataF_ext,
//print_shorts("rx:",rxdataF128+1);
//print_shorts("ch:",dl_ch128+1);
//print_shorts("pack:",rxdataF_comp128+1);
-
// multiply by conjugated channel
mmtmpP0 = _mm_madd_epi16(dl_ch128[2],rxdataF128[2]);
// mmtmpP0 contains real part of 4 consecutive outputs (32-bit)
mmtmpP1 = _mm_shufflelo_epi16(dl_ch128[2],_MM_SHUFFLE(2,3,0,1));
mmtmpP1 = _mm_shufflehi_epi16(mmtmpP1,_MM_SHUFFLE(2,3,0,1));
- mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i*)&conjugate[0]);
+ mmtmpP1 = _mm_sign_epi16(mmtmpP1,*(__m128i *)&conjugate[0]);
mmtmpP1 = _mm_madd_epi16(mmtmpP1,rxdataF128[2]);
// mmtmpP1 contains imag part of 4 consecutive outputs (32-bit)
mmtmpP0 = _mm_srai_epi32(mmtmpP0,output_shift);
@@ -670,26 +656,24 @@ void nr_pdcch_channel_compensation(int32_t **rxdataF_ext,
//print_shorts("rx:",rxdataF128+2);
//print_shorts("ch:",dl_ch128+2);
//print_shorts("pack:",rxdataF_comp128+2);
-
#ifdef NR_PDCCH_DCI_DEBUG
+
for (int i=0; i<12 ; i++)
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_channel_compensation)-> rxdataF128[%d]=(%d,%d) X dlch[%d]=(%d,%d) rxdataF_comp128[%d]=(%d,%d)\n",
- (rb*12)+i, ((short *)rxdataF128)[i<<1],((short*)rxdataF128)[1+(i<<1)],
- (rb*12)+i, ((short *)dl_ch128)[i<<1],((short*)dl_ch128)[1+(i<<1)],
- (rb*12)+i, ((short *)rxdataF_comp128)[i<<1],((short*)rxdataF_comp128)[1+(i<<1)]);
-
+ printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_channel_compensation)-> rxdataF128[%d]=(%d,%d) X dlch[%d]=(%d,%d) rxdataF_comp128[%d]=(%d,%d)\n",
+ (rb*12)+i, ((short *)rxdataF128)[i<<1],((short *)rxdataF128)[1+(i<<1)],
+ (rb*12)+i, ((short *)dl_ch128)[i<<1],((short *)dl_ch128)[1+(i<<1)],
+ (rb*12)+i, ((short *)rxdataF_comp128)[i<<1],((short *)rxdataF_comp128)[1+(i<<1)]);
+
#endif
-
dl_ch128+=3;
rxdataF128+=3;
rxdataF_comp128+=3;
-
-
#elif defined(__arm__)
// to be filled in
#endif
}
}
+
#if defined(__x86_64__) || defined(__i386__)
_mm_empty();
_m_empty();
@@ -699,10 +683,7 @@ void nr_pdcch_channel_compensation(int32_t **rxdataF_ext,
void pdcch_detection_mrc(NR_DL_FRAME_PARMS *frame_parms,
int32_t **rxdataF_comp,
- uint8_t symbol)
-{
-
-
+ uint8_t symbol) {
#if defined(__x86_64__) || defined(__i386__)
__m128i *rxdataF_comp128_0,*rxdataF_comp128_1;
#elif defined(__arm__)
@@ -718,6 +699,7 @@ void pdcch_detection_mrc(NR_DL_FRAME_PARMS *frame_parms,
rxdataF_comp128_0 = (int16x8_t *)&rxdataF_comp[0][symbol*frame_parms->N_RB_DL*12];
rxdataF_comp128_1 = (int16x8_t *)&rxdataF_comp[1][symbol*frame_parms->N_RB_DL*12];
#endif
+
// MRC on each re of rb
for (i=0; iN_RB_DL*3; i++) {
#if defined(__x86_64__) || defined(__i386__)
@@ -732,24 +714,17 @@ void pdcch_detection_mrc(NR_DL_FRAME_PARMS *frame_parms,
_mm_empty();
_m_empty();
#endif
-
}
void pdcch_siso(NR_DL_FRAME_PARMS *frame_parms,
int32_t **rxdataF_comp,
- uint8_t l)
-{
-
-
+ uint8_t l) {
uint8_t rb,re,jj,ii;
-
jj=0;
ii=0;
for (rb=0; rbN_RB_DL; rb++) {
-
for (re=0; re<12; re++) {
-
rxdataF_comp[0][jj++] = rxdataF_comp[0][ii];
ii++;
}
@@ -772,19 +747,19 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
int nb_coreset_active,
uint16_t symbol_mon,
NR_SEARCHSPACE_TYPE_t searchSpaceType) {
-
NR_UE_COMMON *common_vars = &ue->common_vars;
NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
NR_UE_PDCCH **pdcch_vars = ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]];
NR_UE_PDCCH *pdcch_vars2 = ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id];
-
int do_common;
+
if (searchSpaceType == common) do_common=1;
+
if (searchSpaceType == ue_specific) do_common=0;
+
uint8_t log2_maxh, aarx;
int32_t avgs;
int32_t avgP[4];
-
// number of RB (1 symbol) or REG (12 RE) in one CORESET: higher-layer parameter CORESET-freq-dom
// (bit map 45 bits: each bit indicates 6 RB in CORESET -> 1 bit MSB indicates PRB 0..6 are part of CORESET)
uint64_t coreset_freq_dom = pdcch_vars2->coreset[nb_coreset_active].frequencyDomainResources;
@@ -800,12 +775,11 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
//int tci_statesPDCCH = pdcch_vars2->coreset[nb_coreset_active].tciStatesPDCCH;
//int tci_present = pdcch_vars2->coreset[nb_coreset_active].tciPresentInDCI;
uint16_t pdcch_DMRS_scrambling_id = pdcch_vars2->coreset[nb_coreset_active].pdcchDMRSScramblingID;
-
// The UE can be assigned 4 different BWP but only one active at a time.
// For each BWP the number of CORESETs is limited to 3 (including initial CORESET Id=0 -> ControlResourceSetId (0..maxNrofControlReourceSets-1) (0..12-1)
//uint32_t n_BWP_start = 0;
//uint32_t n_rb_offset = 0;
- uint32_t n_rb_offset = pdcch_vars2->coreset[nb_coreset_active].rb_offset+(int)floor(frame_parms->ssb_start_subcarrier/NR_NB_SC_PER_RB);
+ uint32_t n_rb_offset = pdcch_vars2->coreset[nb_coreset_active].rb_offset/*+(int)floor(frame_parms->ssb_start_subcarrier/NR_NB_SC_PER_RB)*/;
// start time position for CORESET
// parameter symbol_mon is a 14 bits bitmap indicating monitoring symbols within a slot
uint8_t start_symbol = 0;
@@ -818,13 +792,12 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
i=14;
}
}
-
+
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> symbol_mon=(%d) and start_symbol=(%d)\n",symbol_mon,start_symbol);
- printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> coreset_freq_dom=(%ld) n_rb_offset=(%d) coreset_time_dur=(%d) n_shift=(%d) reg_bundle_size_L=(%d) coreset_interleaver_size_R=(%d) \n",
- coreset_freq_dom,n_rb_offset,coreset_time_dur,n_shift,reg_bundle_size_L,coreset_interleaver_size_R);
+ printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> coreset_freq_dom=(%ld) n_rb_offset=(%d) coreset_time_dur=(%d) n_shift=(%d) reg_bundle_size_L=(%d) coreset_interleaver_size_R=(%d) scrambling_ID=(%d) \n",
+ coreset_freq_dom,n_rb_offset,coreset_time_dur,n_shift,reg_bundle_size_L,coreset_interleaver_size_R,pdcch_DMRS_scrambling_id);
#endif
-
//
// according to 38.213 v15.1.0: a PDCCH monitoring pattern within a slot,
// indicating first symbol(s) of the control resource set within a slot
@@ -833,14 +806,12 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
// at the moment we do not implement this and start_symbol is always 0
// note that the bitmap symbol_mon may indicate several monitoring times within a same slot (symbols 0..13)
// this may lead to a modification in ue scheduler
-
// indicates the number of active CORESETs for the current BWP to decode PDCCH: max is 3 (this variable is not useful here, to be removed)
//uint8_t coreset_nbr_act;
// indicates the number of REG contained in the PDCCH (number of RBs * number of symbols, in CORESET)
uint8_t coreset_nbr_reg;
uint32_t coreset_C;
uint32_t coreset_nbr_rb = 0;
-
// for (int j=0; j < coreset_nbr_act; j++) {
// for each active CORESET (max number of active CORESETs in a BWP is 3),
// we calculate the number of RB for each CORESET bitmap
@@ -848,10 +819,12 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> coreset_freq_dom=(%ld)\n",coreset_freq_dom);
#endif
int i; //for each bit in the coreset_freq_dom bitmap
+
for (i = 0; i < 45; i++) {
// this loop counts each bit of the bit map coreset_freq_dom, and increments nbr_RB_coreset for each bit set to '1'
if (((coreset_freq_dom & 0x1FFFFFFFFFFF) >> i) & 0x1) coreset_nbr_rb++;
}
+
coreset_nbr_rb = 6 * coreset_nbr_rb; // coreset_nbr_rb has to be multiplied by 6 to indicate the number of PRB or REG(=12 RE) within the CORESET
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> coreset_freq_dom=(%ld,%lx), coreset_nbr_rb=%d\n", coreset_freq_dom,coreset_freq_dom,coreset_nbr_rb);
@@ -860,16 +833,13 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
coreset_C = (uint32_t)(coreset_nbr_reg / (reg_bundle_size_L * coreset_interleaver_size_R));
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> coreset_nbr_rb=%d, coreset_nbr_reg=%d, coreset_C=(%d/(%d*%d))=%d\n",
- coreset_nbr_rb, coreset_nbr_reg, coreset_nbr_reg, reg_bundle_size_L,coreset_interleaver_size_R, coreset_C);
+ coreset_nbr_rb, coreset_nbr_reg, coreset_nbr_reg, reg_bundle_size_L,coreset_interleaver_size_R, coreset_C);
#endif
for (int s = start_symbol; s < (start_symbol + coreset_time_dur); s++) {
-
-
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter nr_pdcch_extract_rbs_single(is_secondary_ue=%d) to remove DM-RS PDCCH\n",
- is_secondary_ue);
+ is_secondary_ue);
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> in nr_pdcch_extract_rbs_single(rxdataF -> rxdataF_ext || dl_ch_estimates -> dl_ch_estimates_ext)\n");
#endif
nr_pdcch_extract_rbs_single(common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx]].rxdataF,
@@ -882,7 +852,6 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
coreset_freq_dom,
coreset_nbr_rb,
n_rb_offset);
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter pdcch_channel_level(avgP=%d) => compute channel level based on ofdm symbol 0, pdcch_vars[eNB_id]->dl_ch_estimates_ext\n",avgP);
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> in pdcch_channel_level(dl_ch_estimates_ext -> dl_ch_estimates_ext)\n");
@@ -893,13 +862,14 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
avgP,
coreset_nbr_rb);
avgs = 0;
+
for (aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++)
avgs = cmax(avgs, avgP[aarx]);
+
log2_maxh = (log2_approx(avgs) / 2) + 5; //+frame_parms->nb_antennas_rx;
#ifdef UE_DEBUG_TRACE
LOG_D(PHY,"nr_tti_rx %d: pdcch log2_maxh = %d (%d,%d)\n",nr_tti_rx,log2_maxh,avgP[0],avgs);
#endif
-
#if T_TRACER
T(T_UE_PHY_PDCCH_ENERGY, T_INT(eNB_id), T_INT(0), T_INT(frame%1024), T_INT(nr_tti_rx),
T_INT(avgP[0]), T_INT(avgP[1]), T_INT(avgP[2]), T_INT(avgP[3]));
@@ -917,8 +887,6 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
s,
log2_maxh,
coreset_nbr_rb); // log2_maxh+I0_shift
-
-
#ifdef DEBUG_PHY
if (nr_tti_rx==5)
@@ -929,7 +897,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
if (frame_parms->nb_antennas_rx > 1) {
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter pdcch_detection_mrc(frame_parms->nb_antennas_rx=%d)\n",
- frame_parms->nb_antennas_rx);
+ frame_parms->nb_antennas_rx);
#endif
pdcch_detection_mrc(frame_parms, pdcch_vars[eNB_id]->rxdataF_comp,s);
}
@@ -939,11 +907,10 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> in nr_pdcch_llr(rxdataF_comp -> llr)\n");
#endif
nr_pdcch_llr(frame_parms,
- pdcch_vars[eNB_id]->rxdataF_comp,
- pdcch_vars[eNB_id]->llr,
- s,
- coreset_nbr_rb);
-
+ pdcch_vars[eNB_id]->rxdataF_comp,
+ pdcch_vars[eNB_id]->llr,
+ s,
+ coreset_nbr_rb);
#if T_TRACER
/*
T(T_UE_PHY_PDCCH_IQ, T_INT(frame_parms->N_RB_DL), T_INT(frame_parms->N_RB_DL),
@@ -954,36 +921,30 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
#ifdef DEBUG_DCI_DECODING
printf("demapping: nr_tti_rx %d, mi %d, tdd_config %d\n",nr_tti_rx,get_mi(frame_parms,nr_tti_rx),frame_parms->tdd_config);
#endif
-
}
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter nr_pdcch_demapping_deinterleaving()\n");
#endif
-
- nr_pdcch_demapping_deinterleaving((uint32_t*) pdcch_vars[eNB_id]->llr,
- (uint32_t*) pdcch_vars[eNB_id]->e_rx,
- frame_parms,
- coreset_time_dur,
- coreset_nbr_rb,
- reg_bundle_size_L,
- coreset_interleaver_size_R,
- n_shift);
-
-
+ nr_pdcch_demapping_deinterleaving((uint32_t *) pdcch_vars[eNB_id]->llr,
+ (uint32_t *) pdcch_vars[eNB_id]->e_rx,
+ frame_parms,
+ coreset_time_dur,
+ coreset_nbr_rb,
+ reg_bundle_size_L,
+ coreset_interleaver_size_R,
+ n_shift);
nr_pdcch_unscrambling(pdcch_vars[eNB_id]->crnti,
- frame_parms,
- nr_tti_rx,
- pdcch_vars[eNB_id]->e_rx,
- coreset_time_dur*coreset_nbr_rb*9*2,
- // get_nCCE(n_pdcch_symbols, frame_parms, mi) * 72,
- pdcch_DMRS_scrambling_id,
- do_common);
+ frame_parms,
+ nr_tti_rx,
+ pdcch_vars[eNB_id]->e_rx,
+ coreset_time_dur*coreset_nbr_rb*9*2,
+ // get_nCCE(n_pdcch_symbols, frame_parms, mi) * 72,
+ pdcch_DMRS_scrambling_id,
+ do_common);
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we end nr_pdcch_unscrambling()\n");
#endif
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> Ending nr_rx_pdcch() function\n");
#endif
@@ -994,25 +955,23 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
void pdcch_scrambling(NR_DL_FRAME_PARMS *frame_parms,
- uint8_t nr_tti_rx,
- uint8_t *e,
- uint32_t length) {
+ uint8_t nr_tti_rx,
+ uint8_t *e,
+ uint32_t length) {
int i;
uint8_t reset;
uint32_t x1, x2, s=0;
-
reset = 1;
// x1 is set in lte_gold_generic
-
x2 = (nr_tti_rx<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.8.2
-
+
for (i=0; i>(i&0x1f))&1));
if (e[i] != 2) // element is 2
e[i] = (e[i]&1) ^ ((s>>(i&0x1f))&1);
@@ -1023,33 +982,34 @@ void pdcch_scrambling(NR_DL_FRAME_PARMS *frame_parms,
#ifdef NR_PDCCH_DCI_RUN
void nr_pdcch_unscrambling(uint16_t crnti, NR_DL_FRAME_PARMS *frame_parms, uint8_t nr_tti_rx,
- int16_t *z, uint32_t length, uint16_t pdcch_DMRS_scrambling_id, int do_common) {
-
+ int16_t *z, uint32_t length, uint16_t pdcch_DMRS_scrambling_id, int do_common) {
int i;
uint8_t reset;
uint32_t x1, x2, s = 0;
uint16_t n_id; //{0,1,...,65535}
uint32_t n_rnti;
-
reset = 1;
+
// x1 is set in first call to lte_gold_generic
//do_common=1;
- if (do_common){
+ if (do_common) {
n_id = frame_parms->Nid_cell;
n_rnti = 0;
} else {
n_id = pdcch_DMRS_scrambling_id;
n_rnti = (uint32_t)crnti;
}
+
//x2 = ((n_rnti * (1 << 16)) + n_id)%(1 << 31);
//uint32_t puissance_2_16 = ((1<<16)*n_rnti)+n_id;
//uint32_t puissance_2_31= (1<<30)*2;
//uint32_t calc_x2=puissance_2_16%puissance_2_31;
x2 = (((1<<16)*n_rnti)+n_id); //mod 2^31 is implicit //this is c_init in 38.211 v15.1.0 Section 7.3.2.3
- // x2 = (nr_tti_rx << 9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.8.2
+ // x2 = (nr_tti_rx << 9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.8.2
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_unscrambling)-> (c_init=%d, n_id=%d, n_rnti=%d, length=%d)\n",x2,n_id,n_rnti,length);
+ //printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_unscrambling)-> (c_init=%d, n_id=%d, n_rnti=%d, length=%d)\n",x2,n_id,n_rnti,length);
#endif
+
for (i = 0; i < length; i++) {
if ((i & 0x1f) == 0) {
s = lte_gold_generic(&x1, &x2, reset);
@@ -1057,107 +1017,99 @@ void nr_pdcch_unscrambling(uint16_t crnti, NR_DL_FRAME_PARMS *frame_parms, uint8
reset = 0;
}
-
- /*
-#ifdef NR_PDCCH_DCI_DEBUG
+ /*
+ #ifdef NR_PDCCH_DCI_DEBUG
if (i%2 == 0) printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_unscrambling)-> unscrambling %d : scrambled_z=%d, => ",
- i,*(char*) &z[(int)floor(i/2)]);
+ i,*(char*) &z[(int)floor(i/2)]);
if (i%2 == 1) printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_unscrambling)-> unscrambling %d : scrambled_z=%d, => ",
- i,*(1 + (char*) &z[(int)floor(i/2)]));
-#endif
+ i,*(1 + (char*) &z[(int)floor(i/2)]));
+ #endif
if (((s >> (i % 32)) & 1) == 1){
if (i%2 == 0) *(char*) &z[(int)floor(i/2)] = -(*(char*) &z[(int)floor(i/2)]);
if (i%2 == 1) *(1 + (char*) &z[(int)floor(i/2)]) = -(*(1 + (char*) &z[(int)floor(i/2)]));
}
//llr[i] = -llr[i];
//llr[i] = (-1)*llr[i];
-#ifdef NR_PDCCH_DCI_DEBUG
+ #ifdef NR_PDCCH_DCI_DEBUG
if (i%2 == 0) printf("unscrambled_z=%d\n",*(char*) &z[(int)floor(i/2)]);
if (i%2 == 1) printf("unscrambled_z=%d\n",*(1 + (char*) &z[(int)floor(i/2)]));
-#endif
+ #endif
*/
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_unscrambling)-> unscrambling %d : scrambled_z=%d, => ",
- i,z[i]);
+ i,z[i]);
#endif
+
if (((s >> (i % 32)) & 1) == 1) z[i] = -z[i];
+
#ifdef NR_PDCCH_DCI_DEBUG
printf("unscrambled_z=%d\n",z[i]);
#endif
}
-
}
#endif
#ifdef NR_PDCCH_DCI_RUN
-void nr_dci_decoding_procedure0(int s,
- int p,
- int coreset_time_dur,
- uint16_t coreset_nbr_rb,
- NR_UE_PDCCH **pdcch_vars,
- int do_common,
- uint8_t nr_tti_rx,
- NR_DCI_ALLOC_t *dci_alloc,
- int16_t eNB_id,
- uint8_t current_thread_id,
- NR_DL_FRAME_PARMS *frame_parms,
- //uint8_t mi,
- uint16_t crc_scrambled_values[TOTAL_NBR_SCRAMBLED_VALUES],
- uint8_t L,
- NR_UE_SEARCHSPACE_CSS_DCI_FORMAT_t format_css,
- NR_UE_SEARCHSPACE_USS_DCI_FORMAT_t format_uss,
- uint8_t sizeof_bits,
- uint8_t sizeof_bytes,
- uint8_t *dci_cnt,
- crc_scrambled_t *crc_scrambled,
- format_found_t *format_found,
- uint16_t pdcch_DMRS_scrambling_id,
- uint32_t *CCEmap0,
- uint32_t *CCEmap1,
- uint32_t *CCEmap2) {
-
- uint16_t crc, CCEind, nCCE[3];
+void nr_dci_decoding_procedure0(int s,
+ int p,
+ int coreset_time_dur,
+ uint16_t coreset_nbr_rb,
+ NR_UE_PDCCH **pdcch_vars,
+ int do_common,
+ uint8_t nr_tti_rx,
+ NR_DCI_ALLOC_t *dci_alloc,
+ int16_t eNB_id,
+ uint8_t current_thread_id,
+ NR_DL_FRAME_PARMS *frame_parms,
+ //uint8_t mi,
+ uint16_t crc_scrambled_values[TOTAL_NBR_SCRAMBLED_VALUES],
+ uint8_t L,
+ NR_UE_SEARCHSPACE_CSS_DCI_FORMAT_t format_css,
+ NR_UE_SEARCHSPACE_USS_DCI_FORMAT_t format_uss,
+ uint8_t sizeof_bits,
+ uint8_t sizeof_bytes,
+ uint8_t *dci_cnt,
+ crc_scrambled_t *crc_scrambled,
+ format_found_t *format_found,
+ uint16_t pdcch_DMRS_scrambling_id,
+ uint32_t *CCEmap0,
+ uint32_t *CCEmap1,
+ uint32_t *CCEmap2) {
+ uint32_t crc, CCEind, nCCE[3];
uint32_t *CCEmap = NULL, CCEmap_mask = 0;
uint8_t L2 = (1 << L);
unsigned int Yk, nb_candidates = 0, i, m;
unsigned int CCEmap_cand;
-
- int8_t decoderState=0;
-
+ uint32_t decoderState=0;
// A[p], p is the current active CORESET
- uint16_t A[3]={39827,39829,39839};
+ uint16_t A[3]= {39827,39829,39839};
//Table 10.1-2: Maximum number of PDCCH candidates per slot and per serving cell as a function of the subcarrier spacing value 2^mu*15 KHz, mu {0,1,2,3}
uint8_t m_max_slot_pdcch_Table10_1_2 [4] = {44,36,22,20};
//Table 10.1-3: Maximum number of non-overlapped CCEs per slot and per serving cell as a function of the subcarrier spacing value 2^mu*15 KHz, mu {0,1,2,3}
//uint8_t cce_max_slot_pdcch_Table10_1_3 [4] = {56,56,48,32};
-
int coreset_nbr_cce_per_symbol=0;
-
- t_nrPolar_paramsPtr nrPolar_params = pdcch_vars[eNB_id]->nrPolar_params;
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> format_found is %d \n", *format_found);
#endif
-
//if (mode == NO_DCI) {
// #ifdef NR_PDCCH_DCI_DEBUG
// printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> skip DCI decoding: expect no DCIs at nr_tti_rx %d in current searchSpace\n", nr_tti_rx);
// #endif
// return;
//}
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> frequencyDomainResources=%lx, duration=%d\n",
- pdcch_vars[eNB_id]->coreset[p].frequencyDomainResources, pdcch_vars[eNB_id]->coreset[p].duration);
+ pdcch_vars[eNB_id]->coreset[p].frequencyDomainResources, pdcch_vars[eNB_id]->coreset[p].duration);
#endif
-
+
// nCCE = get_nCCE(pdcch_vars[eNB_id]->num_pdcch_symbols, frame_parms, mi);
for (int i = 0; i < 45; i++) {
// this loop counts each bit of the bit map coreset_freq_dom, and increments nbr_RB_coreset for each bit set to '1'
if (((pdcch_vars[eNB_id]->coreset[p].frequencyDomainResources & 0x1FFFFFFFFFFF) >> i) & 0x1) coreset_nbr_cce_per_symbol++;
}
+
nCCE[p] = pdcch_vars[eNB_id]->coreset[p].duration*coreset_nbr_cce_per_symbol; // 1 CCE = 6 RB
// p is the current CORESET we are currently monitoring (among the 3 possible CORESETs in a BWP)
// the number of CCE in the current CORESET is:
@@ -1168,46 +1120,52 @@ void nr_dci_decoding_procedure0(int s,
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> nCCE[%d]=%d\n",p,nCCE[p]);
#endif
- /* if (nCCE > get_nCCE(3, frame_parms, 1)) {
- LOG_D(PHY,
- "skip DCI decoding: nCCE=%d > get_nCCE(3,frame_parms,1)=%d\n",
- nCCE, get_nCCE(3, frame_parms, 1));
- return;
- }
-
- if (nCCE < L2) {
- LOG_D(PHY, "skip DCI decoding: nCCE=%d < L2=%d\n", nCCE, L2);
- return;
- }
-
- if (mode == NO_DCI) {
- LOG_D(PHY, "skip DCI decoding: expect no DCIs at nr_tti_rx %d\n",
- nr_tti_rx);
- return;
- }
+ /* if (nCCE > get_nCCE(3, frame_parms, 1)) {
+ LOG_D(PHY,
+ "skip DCI decoding: nCCE=%d > get_nCCE(3,frame_parms,1)=%d\n",
+ nCCE, get_nCCE(3, frame_parms, 1));
+ return;
+ }
+
+ if (nCCE < L2) {
+ LOG_D(PHY, "skip DCI decoding: nCCE=%d < L2=%d\n", nCCE, L2);
+ return;
+ }
+
+ if (mode == NO_DCI) {
+ LOG_D(PHY, "skip DCI decoding: expect no DCIs at nr_tti_rx %d\n",
+ nr_tti_rx);
+ return;
+ }
*/
if (do_common == 1) {
Yk = 0;
+
if (pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.common_dci_formats == cformat2_0) {
// for dci_format_2_0, the nb_candidates is obtained from a different variable
switch (L2) {
- case 1:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel1;
- break;
- case 2:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel2;
- break;
- case 4:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel4;
- break;
- case 8:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel8;
- break;
- case 16:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel16;
- break;
- default:
- break;
+ case 1:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel1;
+ break;
+
+ case 2:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel2;
+ break;
+
+ case 4:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel4;
+ break;
+
+ case 8:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel8;
+ break;
+
+ case 16:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.sfi_nrofCandidates_aggrlevel16;
+ break;
+
+ default:
+ break;
}
} else if (pdcch_vars[eNB_id]->searchSpace[s].searchSpaceType.common_dci_formats == cformat2_3) {
// for dci_format_2_3, the nb_candidates is obtained from a different variable
@@ -1220,49 +1178,59 @@ void nr_dci_decoding_procedure0(int s,
}
} else {
switch (L2) {
- case 1:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel1;
- break;
- case 2:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel2;
- break;
- case 4:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel4;
- break;
- case 8:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel8;
- break;
- case 16:
- nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel16;
- break;
- default:
- break;
+ case 1:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel1;
+ break;
+
+ case 2:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel2;
+ break;
+
+ case 4:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel4;
+ break;
+
+ case 8:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel8;
+ break;
+
+ case 16:
+ nb_candidates = pdcch_vars[eNB_id]->searchSpace[s].nrofCandidates_aggrlevel16;
+ break;
+
+ default:
+ break;
}
-
+
// Find first available in ue specific search space
// according to procedure in Section 10.1 of 38.213
// compute Yk
Yk = (unsigned int) pdcch_vars[eNB_id]->crnti;
+
for (i = 0; i <= nr_tti_rx; i++)
Yk = (Yk * A[p%3]) % 65537;
}
+
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> L2(%d) | nCCE[%d](%d) | Yk(%d) | nb_candidates(%d)\n",L2,p,nCCE[p],Yk,nb_candidates);
#endif
/* for (CCEind=0;
CCEind nCCE[p])
- // nb_candidates = nCCE[p] / L2;
-
+ // if (nb_candidates * L2 > nCCE[p])
+ // nb_candidates = nCCE[p] / L2;
// In the next code line there is maybe a bug. The spec is not comparing Table 10.1-2 with nb_candidates, but with total number of candidates for all s and all p
int m_p_s_L_max = (m_max_slot_pdcch_Table10_1_2[1]<=nb_candidates ? m_max_slot_pdcch_Table10_1_2[1] : nb_candidates);
+
if (L==4) m_p_s_L_max=1; // Table 10.1-2 is not defined for L=4
+
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> m_max_slot_pdcch_Table10_1_2(%d)=%d\n",L,m_max_slot_pdcch_Table10_1_2[L]);
#endif
+
for (m = 0; m < nb_candidates; m++) {
int n_ci = 0;
+
if (nCCE[p] < L2) return;
#ifdef NR_PDCCH_DCI_DEBUG
@@ -1274,9 +1242,10 @@ void nr_dci_decoding_procedure0(int s,
CCEind = (((Yk + (uint16_t)(floor((m*nCCE[p])/(L2*m_p_s_L_max))) + n_ci) % (uint16_t)(floor(nCCE[p] / L2))) * L2);
#ifdef NR_PDCCH_DCI_DEBUG
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> CCEind(%d) = (((Yk(%d) + ((m(%d)*nCCE[p](%d))/(L2(%d)*m_p_s_L_max(%d)))) % (nCCE[p] / L2)) * L2)\n",
- CCEind,Yk,m,nCCE[p],L2,m_p_s_L_max);
+ CCEind,Yk,m,nCCE[p],L2,m_p_s_L_max);
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> n_candidate(m)=%d | CCEind=%d |",m,CCEind);
#endif
+
if (CCEind < 32)
CCEmap = CCEmap0;
else if (CCEind < 64)
@@ -1284,94 +1253,93 @@ void nr_dci_decoding_procedure0(int s,
else if (CCEind < 96)
CCEmap = CCEmap2;
else AssertFatal(1==0,"Illegal CCEind %d (Yk %d, m %d, nCCE %d, L2 %d\n",CCEind, Yk, m, nCCE[p], L2);
-
+
switch (L2) {
- case 1:
- CCEmap_mask = (1 << (CCEind & 0x1f));
- break;
- case 2:
- CCEmap_mask = (3 << (CCEind & 0x1f));
- break;
- case 4:
- CCEmap_mask = (0xf << (CCEind & 0x1f));
- break;
- case 8:
- CCEmap_mask = (0xff << (CCEind & 0x1f));
- break;
- case 16:
- CCEmap_mask = (0xfff << (CCEind & 0x1f));
- break;
- default:
- LOG_E(PHY, "Illegal L2 value %d\n", L2);
- //mac_xface->macphy_exit("Illegal L2\n");
- return; // not reached
+ case 1:
+ CCEmap_mask = (1 << (CCEind & 0x1f));
+ break;
+
+ case 2:
+ CCEmap_mask = (3 << (CCEind & 0x1f));
+ break;
+
+ case 4:
+ CCEmap_mask = (0xf << (CCEind & 0x1f));
+ break;
+
+ case 8:
+ CCEmap_mask = (0xff << (CCEind & 0x1f));
+ break;
+
+ case 16:
+ CCEmap_mask = (0xfff << (CCEind & 0x1f));
+ break;
+
+ default:
+ LOG_E(PHY, "Illegal L2 value %d\n", L2);
+ //mac_xface->macphy_exit("Illegal L2\n");
+ return; // not reached
}
+
CCEmap_cand = (*CCEmap) & CCEmap_mask;
// CCE is not allocated yet
#ifdef NR_PDCCH_DCI_DEBUG
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> CCEmap_cand=%d \n",CCEmap_cand);
#endif
-
- if (CCEmap_cand == 0) {
+ if (CCEmap_cand == 0) {
#ifdef DEBUG_DCI_DECODING
+
if (do_common == 1)
- LOG_I(PHY,"[DCI search nPdcch %d - common] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x)\n",
- pdcch_vars[eNB_id]->num_pdcch_symbols,m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask);
+ LOG_I(PHY,"[DCI search nPdcch %d - common] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x)\n",
+ pdcch_vars[eNB_id]->num_pdcch_symbols,m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask);
else
- LOG_I(PHY,"[DCI search nPdcch %d - ue spec] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x) format %d\n",
- pdcch_vars[eNB_id]->num_pdcch_symbols,m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask,format_uss);
+ LOG_I(PHY,"[DCI search nPdcch %d - ue spec] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x) format %d\n",
+ pdcch_vars[eNB_id]->num_pdcch_symbols,m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask,format_uss);
+
#endif
#ifdef NR_PDCCH_DCI_DEBUG
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> ... we enter function dci_decoding(sizeof_bits=%d L=%d) -----\n",sizeof_bits,L);
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> ... we have to replace this part of the code by polar decoding\n");
#endif
-
-
// for (int m=0; m < (nCCE[p]*6*9*2); m++)
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0: polar decoding)-> polar intput (with coreset_time_dur=%d, coreset_nbr_rb=%d, p=%d, CCEind=%d): \n",
- coreset_time_dur,coreset_nbr_rb,p,CCEind);
+ coreset_time_dur,coreset_nbr_rb,p,CCEind);
#endif
/*
int reg_p=0,reg_e=0;
for (int m=0; m < (L2*6); m++){
- reg_p = (((int)floor(m/coreset_time_dur))+((m%coreset_time_dur)*(L2*6/coreset_time_dur)))*9*2;
- reg_e = m*9*2;
- for (int i=0; i<9*2; i++){
- //polar_input[reg_p+i] = (pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]>0) ? (1.0):(-1.0);
- polar_input[reg_e+i] = (pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]>0) ? (1/sqrt(2)):((-1)/sqrt(2));
- //printf("\t m=%d \tpolar_input[%d]=%lf <-> e_rx[%d]=%d\n",m,reg_e+i,polar_input[reg_e+i],
- // ((CCEind*9*6*2) + reg_e + i),pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]);
- //printf("\t m=%d \tpolar_input[%d]=%lf <-> e_rx[%d]=%d\n",m,reg_p+i,polar_input[reg_p+i],
- // ((CCEind*9*6*2) + reg_e + i),pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]);
- }
+ reg_p = (((int)floor(m/coreset_time_dur))+((m%coreset_time_dur)*(L2*6/coreset_time_dur)))*9*2;
+ reg_e = m*9*2;
+ for (int i=0; i<9*2; i++){
+ //polar_input[reg_p+i] = (pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]>0) ? (1.0):(-1.0);
+ polar_input[reg_e+i] = (pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]>0) ? (1/sqrt(2)):((-1)/sqrt(2));
+ //printf("\t m=%d \tpolar_input[%d]=%lf <-> e_rx[%d]=%d\n",m,reg_e+i,polar_input[reg_e+i],
+ // ((CCEind*9*6*2) + reg_e + i),pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]);
+ //printf("\t m=%d \tpolar_input[%d]=%lf <-> e_rx[%d]=%d\n",m,reg_p+i,polar_input[reg_p+i],
+ // ((CCEind*9*6*2) + reg_e + i),pdcch_vars[eNB_id]->e_rx[((CCEind*9*6*2) + reg_e + i)]);
}
-
-#ifdef NR_PDCCH_DCI_DEBUG
+ }
+
+ #ifdef NR_PDCCH_DCI_DEBUG
printf("\n");
int j=0;
uint32_t polar_hex[27] = {0};
for (int i=0; i polar_hex[%d]=%x\n",j,polar_hex[j]);
-#endif
+ #endif
*/
-
- uint32_t dci_estimation[4]={0};
-
-
- nr_polar_init(&nrPolar_params, 1, sizeof_bits, L2);
-
-
- t_nrPolar_paramsPtr currentPtrDCI=nr_polar_params(nrPolar_params, 1, sizeof_bits, L2);
+ uint64_t dci_estimation[2]= {0};
+ const t_nrPolar_params *currentPtrDCI=nr_polar_params(1, sizeof_bits, L2);
decoderState = polar_decoder_int16(&pdcch_vars[eNB_id]->e_rx[CCEind*9*6*2],
- (uint64_t*)dci_estimation,
- currentPtrDCI);
- crc = decoderState;
+ dci_estimation,
+ currentPtrDCI);
+ crc = decoderState;
//crc = (crc16(&dci_decoded_output[current_thread_id][0], sizeof_bits) >> 16) ^ extract_crc(&dci_decoded_output[current_thread_id][0], sizeof_bits);
#ifdef NR_PDCCH_DCI_DEBUG
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> ... we end function dci_decoding() with crc=%x\n",crc);
@@ -1385,202 +1353,228 @@ void nr_dci_decoding_procedure0(int s,
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> crc_scrambled=%d\n",*crc_scrambled);
#endif
-
if (crc == crc_scrambled_values[_C_RNTI_]) {
- *crc_scrambled =_c_rnti;
- *format_found=1;
+ *crc_scrambled =_c_rnti;
+ *format_found=1;
}
+
if (crc == crc_scrambled_values[_CS_RNTI_]) {
- *crc_scrambled =_cs_rnti;
- *format_found=1;
+ *crc_scrambled =_cs_rnti;
+ *format_found=1;
}
+
if (crc == crc_scrambled_values[_NEW_RNTI_]) {
- *crc_scrambled =_new_rnti;
- *format_found=1;
+ *crc_scrambled =_new_rnti;
+ *format_found=1;
}
+
if (crc == crc_scrambled_values[_TC_RNTI_]) {
- *crc_scrambled =_tc_rnti;
- *format_found=_format_1_0_found;
+ *crc_scrambled =_tc_rnti;
+ *format_found=_format_1_0_found;
}
+
if (crc == crc_scrambled_values[_P_RNTI_]) {
- *crc_scrambled =_p_rnti;
- *format_found=_format_1_0_found;
+ *crc_scrambled =_p_rnti;
+ *format_found=_format_1_0_found;
}
+
if (crc == crc_scrambled_values[_SI_RNTI_]) {
- *crc_scrambled =_si_rnti;
- *format_found=_format_1_0_found;
+ *crc_scrambled =_si_rnti;
+ *format_found=_format_1_0_found;
}
+
if (crc == crc_scrambled_values[_RA_RNTI_]) {
- *crc_scrambled =_ra_rnti;
- *format_found=_format_1_0_found;
+ *crc_scrambled =_ra_rnti;
+ *format_found=_format_1_0_found;
}
+
if (crc == crc_scrambled_values[_SP_CSI_RNTI_]) {
- *crc_scrambled =_sp_csi_rnti;
- *format_found=_format_0_1_found;
+ *crc_scrambled =_sp_csi_rnti;
+ *format_found=_format_0_1_found;
}
+
if (crc == crc_scrambled_values[_SFI_RNTI_]) {
- *crc_scrambled =_sfi_rnti;
- *format_found=_format_2_0_found;
+ *crc_scrambled =_sfi_rnti;
+ *format_found=_format_2_0_found;
}
+
if (crc == crc_scrambled_values[_INT_RNTI_]) {
- *crc_scrambled =_int_rnti;
- *format_found=_format_2_1_found;
+ *crc_scrambled =_int_rnti;
+ *format_found=_format_2_1_found;
}
+
if (crc == crc_scrambled_values[_TPC_PUSCH_RNTI_]) {
- *crc_scrambled =_tpc_pusch_rnti;
- *format_found=_format_2_2_found;
+ *crc_scrambled =_tpc_pusch_rnti;
+ *format_found=_format_2_2_found;
}
+
if (crc == crc_scrambled_values[_TPC_PUCCH_RNTI_]) {
- *crc_scrambled =_tpc_pucch_rnti;
- *format_found=_format_2_2_found;
+ *crc_scrambled =_tpc_pucch_rnti;
+ *format_found=_format_2_2_found;
}
+
if (crc == crc_scrambled_values[_TPC_SRS_RNTI_]) {
- *crc_scrambled =_tpc_srs_rnti;
- *format_found=_format_2_3_found;
+ *crc_scrambled =_tpc_srs_rnti;
+ *format_found=_format_2_3_found;
}
-#ifdef NR_PDCCH_DCI_DEBUG
+
+ //#ifdef NR_PDCCH_DCI_DEBUG
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> format_found=%d\n",*format_found);
printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> crc_scrambled=%d\n",*crc_scrambled);
-#endif
- if (*format_found!=255) {
- dci_alloc[*dci_cnt].dci_length = sizeof_bits;
- dci_alloc[*dci_cnt].rnti = crc;
- dci_alloc[*dci_cnt].L = L;
- dci_alloc[*dci_cnt].firstCCE = CCEind;
- dci_alloc[*dci_cnt].dci_pdu[0] = dci_estimation[0];
- dci_alloc[*dci_cnt].dci_pdu[1] = dci_estimation[1];
- dci_alloc[*dci_cnt].dci_pdu[2] = dci_estimation[2];
- dci_alloc[*dci_cnt].dci_pdu[3] = dci_estimation[3];
-#ifdef NR_PDCCH_DCI_DEBUG
- printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> rnti matches -> DCI FOUND !!! crc =>%x, sizeof_bits %d, sizeof_bytes %d \n",
- dci_alloc[*dci_cnt].rnti, dci_alloc[*dci_cnt].dci_length, sizeof_bytes);
- printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> dci_cnt %d (format_css %d crc_scrambled %d) L %d, firstCCE %d pdu[0] %x pdu[1] %x pdu[2] %x pdu[3] %x \n",
- *dci_cnt, format_css,*crc_scrambled,dci_alloc[*dci_cnt].L, dci_alloc[*dci_cnt].firstCCE,dci_alloc[*dci_cnt].dci_pdu[0],dci_alloc[*dci_cnt].dci_pdu[1],dci_alloc[*dci_cnt].dci_pdu[2],dci_alloc[*dci_cnt].dci_pdu[3]);
-#endif
- if ((format_css == cformat0_0_and_1_0) || (format_uss == uformat0_0_and_1_0)){
- if ((*crc_scrambled == _p_rnti) || (*crc_scrambled == _si_rnti) || (*crc_scrambled == _ra_rnti)){
- dci_alloc[*dci_cnt].format = format1_0;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_1_0_found;
- // printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> a format1_0=%d and dci_cnt=%d\n",*format_found,*dci_cnt);
- } else {
- if ((dci_estimation[0]&1) == 0){
- dci_alloc[*dci_cnt].format = format0_0;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_0_0_found;
- // printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> b format0_0=%d and dci_cnt=%d\n",*format_found,*dci_cnt);
- }
- if ((dci_estimation[0]&1) == 1){
- dci_alloc[*dci_cnt].format = format1_0;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_1_0_found;
- // printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> c format1_0=%d and dci_cnt=%d\n",*format_found,*dci_cnt);
- }
- }
- }
- if (format_css == cformat2_0){
- dci_alloc[*dci_cnt].format = format2_0;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_2_0_found;
- }
- if (format_css == cformat2_1){
- dci_alloc[*dci_cnt].format = format2_1;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_2_1_found;
- }
- if (format_css == cformat2_2){
- dci_alloc[*dci_cnt].format = format2_2;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_2_2_found;
- }
- if (format_css == cformat2_3){
- dci_alloc[*dci_cnt].format = format2_3;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_2_3_found;
- }
- if (format_uss == uformat0_1_and_1_1){
- if ((dci_estimation[0]&1) == 0){
- dci_alloc[*dci_cnt].format = format0_1;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_0_1_found;
- }
- if ((dci_estimation[0]&1) == 1){
- dci_alloc[*dci_cnt].format = format1_1;
- *dci_cnt = *dci_cnt + 1;
- *format_found=_format_1_1_found;
- }
- }
- // store first nCCE of group for PUCCH transmission of ACK/NAK
- pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
- /* if (crc == si_rnti) {
- dci_alloc[*dci_cnt].format = format_si;
- *dci_cnt = *dci_cnt + 1;
- } else if (crc == p_rnti) {
- dci_alloc[*dci_cnt].format = format_p;
- *dci_cnt = *dci_cnt + 1;
- } else if (crc == ra_rnti) {
- dci_alloc[*dci_cnt].format = format_ra;
- // store first nCCE of group for PUCCH transmission of ACK/NAK
- pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
- *dci_cnt = *dci_cnt + 1;
- } else if (crc == pdcch_vars[eNB_id]->crnti) {
- if ((mode & UL_DCI) && (format_c == format0)
- && ((dci_decoded_output[current_thread_id][0] & 0x80)
- == 0)) { // check if pdu is format 0 or 1A
- if (*format0_found == 0) {
- dci_alloc[*dci_cnt].format = format0;
- *format0_found = 1;
- *dci_cnt = *dci_cnt + 1;
- pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
- }
- } else if (format_c == format0) { // this is a format 1A DCI
- dci_alloc[*dci_cnt].format = format1A;
- *dci_cnt = *dci_cnt + 1;
- pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
- } else {
- // store first nCCE of group for PUCCH transmission of ACK/NAK
- if (*format_c_found == 0) {
- dci_alloc[*dci_cnt].format = format_c;
- *dci_cnt = *dci_cnt + 1;
- *format_c_found = 1;
- pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
- }
- }
- }*/
- //LOG_I(PHY,"DCI decoding CRNTI [format: %d, nCCE[nr_tti_rx: %d]: %d ], AggregationLevel %d \n",format_c, nr_tti_rx, pdcch_vars[eNB_id]->nCCE[nr_tti_rx],L2);
- // memcpy(&dci_alloc[*dci_cnt].dci_pdu[0],dci_decoded_output,sizeof_bytes);
- switch (1 << L) {
- case 1:
- *CCEmap |= (1 << (CCEind & 0x1f));
- break;
- case 2:
- *CCEmap |= (1 << (CCEind & 0x1f));
- break;
- case 4:
- *CCEmap |= (1 << (CCEind & 0x1f));
- break;
- case 8:
- *CCEmap |= (1 << (CCEind & 0x1f));
- break;
- case 16:
- *CCEmap |= (1 << (CCEind & 0x1f));
- break;
- }
+ //#endif
+ if (*format_found!=255) {
+ dci_alloc[*dci_cnt].dci_length = sizeof_bits;
+ dci_alloc[*dci_cnt].rnti = crc;
+ dci_alloc[*dci_cnt].L = L;
+ dci_alloc[*dci_cnt].firstCCE = CCEind;
+ dci_alloc[*dci_cnt].dci_pdu[0] = dci_estimation[0];
+ dci_alloc[*dci_cnt].dci_pdu[1] = dci_estimation[1];
+ dci_alloc[*dci_cnt].dci_pdu[2] = dci_estimation[2];
+ dci_alloc[*dci_cnt].dci_pdu[3] = dci_estimation[3];
+ //#ifdef NR_PDCCH_DCI_DEBUG
+ printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> rnti matches -> DCI FOUND !!! crc =>0x%x, sizeof_bits %d, sizeof_bytes %d \n",
+ dci_alloc[*dci_cnt].rnti, dci_alloc[*dci_cnt].dci_length, sizeof_bytes);
+ printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> dci_cnt %d (format_css %d crc_scrambled %d) L %d, firstCCE %d pdu[0] 0x%lx pdu[1] 0x%lx \n",
+ *dci_cnt, format_css,*crc_scrambled,dci_alloc[*dci_cnt].L, dci_alloc[*dci_cnt].firstCCE,dci_alloc[*dci_cnt].dci_pdu[0],dci_alloc[*dci_cnt].dci_pdu[1]);
+
+ //#endif
+ if ((format_css == cformat0_0_and_1_0) || (format_uss == uformat0_0_and_1_0)) {
+ if ((*crc_scrambled == _p_rnti) || (*crc_scrambled == _si_rnti) || (*crc_scrambled == _ra_rnti)) {
+ dci_alloc[*dci_cnt].format = format1_0;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_1_0_found;
+ // printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> a format1_0=%d and dci_cnt=%d\n",*format_found,*dci_cnt);
+ } else {
+ if ((dci_estimation[0]&1) == 0) {
+ dci_alloc[*dci_cnt].format = format0_0;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_0_0_found;
+ // printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> b format0_0=%d and dci_cnt=%d\n",*format_found,*dci_cnt);
+ }
+
+ if ((dci_estimation[0]&1) == 1) {
+ dci_alloc[*dci_cnt].format = format1_0;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_1_0_found;
+ // printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> c format1_0=%d and dci_cnt=%d\n",*format_found,*dci_cnt);
+ }
+ }
+ }
+
+ if (format_css == cformat2_0) {
+ dci_alloc[*dci_cnt].format = format2_0;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_2_0_found;
+ }
+
+ if (format_css == cformat2_1) {
+ dci_alloc[*dci_cnt].format = format2_1;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_2_1_found;
+ }
+
+ if (format_css == cformat2_2) {
+ dci_alloc[*dci_cnt].format = format2_2;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_2_2_found;
+ }
+
+ if (format_css == cformat2_3) {
+ dci_alloc[*dci_cnt].format = format2_3;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_2_3_found;
+ }
+
+ if (format_uss == uformat0_1_and_1_1) {
+ if ((dci_estimation[0]&1) == 0) {
+ dci_alloc[*dci_cnt].format = format0_1;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_0_1_found;
+ }
+
+ if ((dci_estimation[0]&1) == 1) {
+ dci_alloc[*dci_cnt].format = format1_1;
+ *dci_cnt = *dci_cnt + 1;
+ *format_found=_format_1_1_found;
+ }
+ }
+
+ // store first nCCE of group for PUCCH transmission of ACK/NAK
+ pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
+
+ /* if (crc == si_rnti) {
+ dci_alloc[*dci_cnt].format = format_si;
+ *dci_cnt = *dci_cnt + 1;
+ } else if (crc == p_rnti) {
+ dci_alloc[*dci_cnt].format = format_p;
+ *dci_cnt = *dci_cnt + 1;
+ } else if (crc == ra_rnti) {
+ dci_alloc[*dci_cnt].format = format_ra;
+ // store first nCCE of group for PUCCH transmission of ACK/NAK
+ pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
+ *dci_cnt = *dci_cnt + 1;
+ } else if (crc == pdcch_vars[eNB_id]->crnti) {
+
+ if ((mode & UL_DCI) && (format_c == format0)
+ && ((dci_decoded_output[current_thread_id][0] & 0x80)
+ == 0)) { // check if pdu is format 0 or 1A
+ if (*format0_found == 0) {
+ dci_alloc[*dci_cnt].format = format0;
+ *format0_found = 1;
+ *dci_cnt = *dci_cnt + 1;
+ pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
+ }
+ } else if (format_c == format0) { // this is a format 1A DCI
+ dci_alloc[*dci_cnt].format = format1A;
+ *dci_cnt = *dci_cnt + 1;
+ pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
+ } else {
+ // store first nCCE of group for PUCCH transmission of ACK/NAK
+ if (*format_c_found == 0) {
+ dci_alloc[*dci_cnt].format = format_c;
+ *dci_cnt = *dci_cnt + 1;
+ *format_c_found = 1;
+ pdcch_vars[eNB_id]->nCCE[nr_tti_rx] = CCEind;
+ }
+ }
+ }*/
+ //LOG_I(PHY,"DCI decoding CRNTI [format: %d, nCCE[nr_tti_rx: %d]: %d ], AggregationLevel %d \n",format_c, nr_tti_rx, pdcch_vars[eNB_id]->nCCE[nr_tti_rx],L2);
+ // memcpy(&dci_alloc[*dci_cnt].dci_pdu[0],dci_decoded_output,sizeof_bytes);
+ switch (1 << L) {
+ case 1:
+ *CCEmap |= (1 << (CCEind & 0x1f));
+ break;
+
+ case 2:
+ *CCEmap |= (1 << (CCEind & 0x1f));
+ break;
+
+ case 4:
+ *CCEmap |= (1 << (CCEind & 0x1f));
+ break;
+
+ case 8:
+ *CCEmap |= (1 << (CCEind & 0x1f));
+ break;
+
+ case 16:
+ *CCEmap |= (1 << (CCEind & 0x1f));
+ break;
+ }
#ifdef DEBUG_DCI_DECODING
- LOG_I(PHY,"[DCI search] Found DCI %d rnti %x Aggregation %d length %d format %d in CCE %d (CCEmap %x) candidate %d / %d \n",
- *dci_cnt,crc,1< end candidate loop\n");
#endif
@@ -1750,10 +1745,10 @@ void nr_dci_decoding_procedure0(int s,
L,
&pdcch_vars[eNB_id]->e_rx[CCEind*72],
&dci_decoded_output[current_thread_id][0]);
-
+
// for (i=0;i<3+(sizeof_bits>>3);i++)
// printf("dci_decoded_output[%d] => %x\n",i,dci_decoded_output[i]);
-
+
crc = (crc16(&dci_decoded_output[current_thread_id][0],sizeof_bits)>>16) ^ extract_crc(&dci_decoded_output[current_thread_id][0],sizeof_bits);
#ifdef DEBUG_DCI_DECODING
printf("crc =>%x\n",crc);
@@ -1861,8 +1856,8 @@ void nr_dci_decoding_procedure0(int s,
return;
} // rnti match
} // CCEmap_cand == 0
-
- // if ( agregationLevel != 0xFF &&
+
+ // if ( agregationLevel != 0xFF &&
// (format_c == format0 && m==0 && si_rnti != SI_RNTI))
// {
// //Only valid for OAI : Save some processing time when looking for DCI format0. From the log we see the DCI only on candidate 0.
@@ -2051,18 +2046,17 @@ void nr_dci_decoding_procedure0(int s,
#ifdef NR_PDCCH_DCI_RUN
uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
- uint16_t eNB_id,
- uint8_t nr_tti_rx,
- int p,
- crc_scrambled_t crc_scrambled,
- uint16_t n_RB_ULBWP,
- uint16_t n_RB_DLBWP,
- uint8_t dci_fields_sizes[NBR_NR_DCI_FIELDS][NBR_NR_FORMATS],
- uint8_t format){
+ uint16_t eNB_id,
+ uint8_t nr_tti_rx,
+ int p,
+ crc_scrambled_t crc_scrambled,
+ uint16_t n_RB_ULBWP,
+ uint16_t n_RB_DLBWP,
+ uint8_t dci_fields_sizes[NBR_NR_DCI_FIELDS][NBR_NR_FORMATS],
+ uint8_t format) {
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_format_size)-> crc_scrambled=%d, n_RB_ULBWP=%d, n_RB_DLBWP=%d\n",crc_scrambled,n_RB_ULBWP,n_RB_DLBWP);
#endif
-
/*
* function nr_dci_format_size calculates and returns the size in bits of a determined format
* it also returns an bi-dimensional array 'dci_fields_sizes' with x rows and y columns, where:
@@ -2070,7 +2064,6 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
* y is the number of formats
* e.g.: dci_fields_sizes[10][0] contains the size in bits of the field FREQ_DOM_RESOURCE_ASSIGNMENT_UL for format 0_0
*/
-
// pdsch_config contains the PDSCH-Config IE is used to configure the UE specific PDSCH parameters (TS 38.331)
PDSCH_Config_t pdsch_config = ue->PDSCH_Config;
// pusch_config contains the PUSCH-Config IE is used to configure the UE specific PUSCH parameters (TS 38.331)
@@ -2083,15 +2076,14 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
PUSCH_ServingCellConfig_t PUSCH_ServingCellConfig= ue->PUSCH_ServingCellConfig;
PDSCH_ServingCellConfig_t PDSCH_ServingCellConfig= ue->PDSCH_ServingCellConfig;
NR_UE_PDCCH *pdcch_vars2 = ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id];
-
// 1 CARRIER_IN
// crossCarrierSchedulingConfig from higher layers, variable crossCarrierSchedulingConfig indicates if 'cross carrier scheduling' is enabled or not:
// if No cross carrier scheduling: number of bits for CARRIER_IND is 0
// if Cross carrier scheduling: number of bits for CARRIER_IND is 3
// The IE CrossCarrierSchedulingConfig is used to specify the configuration when the cross-carrier scheduling is used in a cell
uint8_t crossCarrierSchedulingConfig_ind = 0;
- if (crossCarrierSchedulingConfig.schedulingCellInfo.other.cif_InSchedulingCell !=0 ) crossCarrierSchedulingConfig_ind=1;
+ if (crossCarrierSchedulingConfig.schedulingCellInfo.other.cif_InSchedulingCell !=0 ) crossCarrierSchedulingConfig_ind=1;
// 2 SUL_IND_0_1, // 40 SRS_REQUEST, // 50 SUL_IND_0_0
// UL/SUL indicator (TS 38.331, supplementary uplink is indicated in higher layer parameter ServCellAdd-SUL from IE ServingCellConfig and ServingCellConfigCommon):
@@ -2099,7 +2091,6 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
// 1 bit for UEs configured with SUL in the cell as defined in Table 7.3.1.1.1-1
// sul_ind indicates whether SUL is configured in cell or not
uint8_t sul_ind=ue->supplementaryUplink.supplementaryUplink; // this value will be 0 or 1 depending on higher layer parameter ServCellAdd-SUL. FIXME!!!
-
// 7 BANDWIDTH_PART_IND
// number of UL BWPs configured by higher layers
uint8_t n_UL_BWP_RRC=1; // initialized to 1 but it has to be initialized by higher layers FIXME!!!
@@ -2107,16 +2098,14 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
// number of DL BWPs configured by higher layers
uint8_t n_DL_BWP_RRC=1; // initialized to 1 but it has to be initialized by higher layers FIXME!!!
n_DL_BWP_RRC = ((n_DL_BWP_RRC > 3)?n_DL_BWP_RRC:(n_DL_BWP_RRC+1));
-
-
// 10 FREQ_DOM_RESOURCE_ASSIGNMENT_UL
// if format0_0, only resource allocation type 1 is allowed
// if format0_1, then resource allocation type 0 can be configured and N_RBG is defined in TS 38.214 subclause 6.1.2.2.1
-
// for PUSCH hopping with resource allocation type 1
// n_UL_hopping = 1 if the higher layer parameter frequencyHoppingOffsetLists contains two offset values
// n_UL_hopping = 2 if the higher layer parameter frequencyHoppingOffsetLists contains four offset values
uint8_t n_UL_hopping=pusch_config.n_frequencyHoppingOffsetLists;
+
if (n_UL_hopping == 2) {
n_UL_hopping = 1;
} else if (n_UL_hopping == 4) {
@@ -2124,27 +2113,39 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
} else {
n_UL_hopping = 0;
}
+
ul_resourceAllocation_t ul_resource_allocation_type = pusch_config.ul_resourceAllocation;
uint8_t ul_res_alloc_type_0 = 0;
uint8_t ul_res_alloc_type_1 = 0;
+
if (ul_resource_allocation_type == ul_resourceAllocationType0) ul_res_alloc_type_0 = 1;
+
if (ul_resource_allocation_type == ul_resourceAllocationType1) ul_res_alloc_type_1 = 1;
+
if (ul_resource_allocation_type == ul_dynamicSwitch) {
ul_res_alloc_type_0 = 1;
ul_res_alloc_type_1 = 1;
}
+
uint8_t n_bits_freq_dom_res_assign_ul=0,n_ul_RGB_tmp;
- if (ul_res_alloc_type_0 == 1){ // implementation of Table 6.1.2.2.1-1 TC 38.214 subclause 6.1.2.2.1
+
+ if (ul_res_alloc_type_0 == 1) { // implementation of Table 6.1.2.2.1-1 TC 38.214 subclause 6.1.2.2.1
// config1: PUSCH-Config IE contains rbg-Size ENUMERATED {config1 config2}
ul_rgb_Size_t config = pusch_config.ul_rgbSize;
uint8_t nominal_RBG_P = (config==ul_rgb_config1?2:4);
+
if (n_RB_ULBWP > 36) nominal_RBG_P = (config==ul_rgb_config1?4:8);
+
if (n_RB_ULBWP > 72) nominal_RBG_P = (config==ul_rgb_config1?8:16);
+
if (n_RB_ULBWP > 144) nominal_RBG_P = 16;
+
n_bits_freq_dom_res_assign_ul = (uint8_t)ceil((n_RB_ULBWP+(0%nominal_RBG_P))/nominal_RBG_P); //FIXME!!! what is 0???
n_ul_RGB_tmp = n_bits_freq_dom_res_assign_ul;
}
+
if (ul_res_alloc_type_1 == 1) n_bits_freq_dom_res_assign_ul = (uint8_t)(ceil(log2(n_RB_ULBWP*(n_RB_ULBWP+1)/2)))-n_UL_hopping;
+
if ((ul_res_alloc_type_0 == 1) && (ul_res_alloc_type_1 == 1))
n_bits_freq_dom_res_assign_ul = ((n_bits_freq_dom_res_assign_ul>n_ul_RGB_tmp)?(n_bits_freq_dom_res_assign_ul+1):(n_ul_RGB_tmp+1));
@@ -2154,37 +2155,49 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
dl_resourceAllocation_t dl_resource_allocation_type = pdsch_config.dl_resourceAllocation;
uint8_t dl_res_alloc_type_0 = 0;
uint8_t dl_res_alloc_type_1 = 0;
+
if (dl_resource_allocation_type == dl_resourceAllocationType0) dl_res_alloc_type_0 = 1;
+
if (dl_resource_allocation_type == dl_resourceAllocationType1) dl_res_alloc_type_1 = 1;
+
if (dl_resource_allocation_type == dl_dynamicSwitch) {
dl_res_alloc_type_0 = 1;
dl_res_alloc_type_1 = 1;
}
+
uint8_t n_bits_freq_dom_res_assign_dl=0,n_dl_RGB_tmp;
- if (dl_res_alloc_type_0 == 1){ // implementation of Table 5.1.2.2.1-1 TC 38.214 subclause 6.1.2.2.1
+
+ if (dl_res_alloc_type_0 == 1) { // implementation of Table 5.1.2.2.1-1 TC 38.214 subclause 6.1.2.2.1
// config1: PDSCH-Config IE contains rbg-Size ENUMERATED {config1, config2}
dl_rgb_Size_t config = pdsch_config.dl_rgbSize;
uint8_t nominal_RBG_P = (config==dl_rgb_config1?2:4);
+
if (n_RB_DLBWP > 36) nominal_RBG_P = (config==dl_rgb_config1?4:8);
+
if (n_RB_DLBWP > 72) nominal_RBG_P = (config==dl_rgb_config1?8:16);
+
if (n_RB_DLBWP > 144) nominal_RBG_P = 16;
+
n_bits_freq_dom_res_assign_dl = (uint8_t)ceil((n_RB_DLBWP+(0%nominal_RBG_P))/nominal_RBG_P); //FIXME!!! what is 0???
n_dl_RGB_tmp = n_bits_freq_dom_res_assign_dl;
}
+
if (dl_res_alloc_type_1 == 1) n_bits_freq_dom_res_assign_dl = (uint8_t)(ceil(log2(n_RB_DLBWP*(n_RB_DLBWP+1)/2)));
+
if ((dl_res_alloc_type_0 == 1) && (dl_res_alloc_type_1 == 1))
n_bits_freq_dom_res_assign_dl = ((n_bits_freq_dom_res_assign_dl>n_dl_RGB_tmp)?(n_bits_freq_dom_res_assign_dl+1):(n_dl_RGB_tmp+1));
// 12 TIME_DOM_RESOURCE_ASSIGNMENT
uint8_t pusch_alloc_list = pusch_config.n_push_alloc_list;
uint8_t pdsch_alloc_list = pdsch_config.n_pdsh_alloc_list;
-
// 14 PRB_BUNDLING_SIZE_IND:0 bit if the higher layer parameter PRB_bundling is not configured or is set to 'static', or 1 bit if the higher layer parameter PRB_bundling is set to 'dynamic' according to Subclause 5.1.2.3 of [6, TS 38.214]
static_bundleSize_t static_prb_BundlingType = pdsch_config.prbBundleType.staticBundling;
bundleSizeSet1_t dynamic_prb_BundlingType1 = pdsch_config.prbBundleType.dynamicBundlig.bundleSizeSet1;
bundleSizeSet2_t dynamic_prb_BundlingType2 = pdsch_config.prbBundleType.dynamicBundlig.bundleSizeSet2;
uint8_t prb_BundlingType_size=0;
+
if ((static_prb_BundlingType==st_n4)||(static_prb_BundlingType==st_wideband)) prb_BundlingType_size=0;
+
if ((dynamic_prb_BundlingType1==dy_1_n4)||(dynamic_prb_BundlingType1==dy_1_wideband)||(dynamic_prb_BundlingType1==dy_1_n2_wideband)||(dynamic_prb_BundlingType1==dy_1_n4_wideband)||
(dynamic_prb_BundlingType2==dy_2_n4)||(dynamic_prb_BundlingType2==dy_2_wideband)) prb_BundlingType_size=1;
@@ -2195,37 +2208,38 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
// 0, 1, or 2 bits as defined in Subclause 5.1.4.2 of [6, TS 38.214].
// is the number of ZP CSI-RS resource sets in the higher layer parameter zp-CSI-RS-Resource
uint8_t n_zp_bits = pdsch_config.n_zp_CSI_RS_ResourceId;
-
// 17 FREQ_HOPPING_FLAG
// freqHopping is defined by higher layer parameter frequencyHopping from IE PUSCH-Config. Values are ENUMERATED{mode1, mode2}
frequencyHopping_t f_hopping = pusch_config.frequencyHopping;
uint8_t freqHopping = 0;
+
if ((f_hopping==f_hop_mode1)||(f_hopping==f_hop_mode2)) freqHopping = 1;
// 28 DAI
pdsch_HARQ_ACK_Codebook_t pdsch_HARQ_ACK_Codebook = pdsch_config.pdsch_HARQ_ACK_Codebook;
uint8_t n_dai = 0;
uint8_t n_serving_cell_dl = 1; // this is hardcoded to 1 as we need to get this value from RRC higher layers parameters. FIXME!!!
+
if ((pdsch_HARQ_ACK_Codebook == dynamic) && (n_serving_cell_dl == 1)) n_dai = 2;
+
if ((pdsch_HARQ_ACK_Codebook == dynamic) && (n_serving_cell_dl > 1)) n_dai = 4;
// 29 FIRST_DAI
uint8_t codebook_HARQ_ACK = 0; // We need to get this value to calculate number of bits of fields 1st DAI and 2nd DAI.
+
if (pdsch_HARQ_ACK_Codebook == semiStatic) codebook_HARQ_ACK = 1;
+
if (pdsch_HARQ_ACK_Codebook == dynamic) codebook_HARQ_ACK = 2;
// 30 SECOND_DAI
uint8_t n_HARQ_ACK_sub_codebooks = 0; // We need to get this value to calculate number of bits of fields 1st DAI and 2nd DAI. FIXME!!!
-
// 35 PDSCH_TO_HARQ_FEEDBACK_TIME_IND
uint8_t pdsch_harq_t_ind = (uint8_t)ceil(log2(pucch_config_dedicated.dl_DataToUL_ACK[0]));
-
// 36 SRS_RESOURCE_IND
// n_SRS is the number of configured SRS resources in the SRS resource set associated with the higher layer parameter usage of value 'codeBook' or 'nonCodeBook'
// from SRS_ResourceSet_t type we should get the information of the usage parameter (with possible values beamManagement, codebook, nonCodebook, antennaSwitching)
// at frame_parms->srs_nr->p_SRS_ResourceSetList[]->usage
uint8_t n_SRS = ue->srs.number_srs_Resource_Set;
-
// 37 PRECOD_NBR_LAYERS
// 38 ANTENNA_PORTS
txConfig_t txConfig = pusch_config.txConfig;
@@ -2235,91 +2249,118 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
uint8_t num_antenna_ports = 1; // this is hardcoded. We need to get the real value FIXME!!!
uint8_t precond_nbr_layers_bits = 0;
uint8_t antenna_ports_bits_ul = 0;
+
// searching number of bits at tables 7.3.1.1.2-2/3/4/5 from TS 38.212 subclause 7.3.1.1.2
- if (txConfig == txConfig_codebook){
+ if (txConfig == txConfig_codebook) {
if (num_antenna_ports == 4) {
if ((transformPrecoder == transformPrecoder_disabled) && ((maxRank == 2)||(maxRank == 3)||(maxRank == 4))) { // Table 7.3.1.1.2-2
- if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=6;
- if (codebookSubset == codebookSubset_partialAndNonCoherent) precond_nbr_layers_bits=5;
- if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=4;
+ if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=6;
+
+ if (codebookSubset == codebookSubset_partialAndNonCoherent) precond_nbr_layers_bits=5;
+
+ if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=4;
}
+
if (((transformPrecoder == transformPrecoder_enabled)||(transformPrecoder == transformPrecoder_disabled)) && (maxRank == 1)) { // Table 7.3.1.1.2-3
- if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=5;
- if (codebookSubset == codebookSubset_partialAndNonCoherent) precond_nbr_layers_bits=4;
- if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=2;
+ if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=5;
+
+ if (codebookSubset == codebookSubset_partialAndNonCoherent) precond_nbr_layers_bits=4;
+
+ if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=2;
}
}
+
if (num_antenna_ports == 2) {
if ((transformPrecoder == transformPrecoder_disabled) && (maxRank == 2)) { // Table 7.3.1.1.2-4
- if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=4;
- if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=2;
+ if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=4;
+
+ if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=2;
}
+
if (((transformPrecoder == transformPrecoder_enabled)||(transformPrecoder == transformPrecoder_disabled)) && (maxRank == 1)) { // Table 7.3.1.1.2-5
- if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=3;
- if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=1;
+ if (codebookSubset == codebookSubset_fullyAndPartialAndNonCoherent) precond_nbr_layers_bits=3;
+
+ if (codebookSubset == codebookSubset_nonCoherent) precond_nbr_layers_bits=1;
}
}
}
- if (txConfig == txConfig_nonCodebook){
+
+ if (txConfig == txConfig_nonCodebook) {
}
+
// searching number of bits at tables 7.3.1.1.2-6/7/8/9/10/11/12/13/14/15/16/17/18/19
- if((dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type1)){
+ if((dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type1)) {
if ((transformPrecoder == transformPrecoder_enabled) && (dmrs_UplinkConfig.pusch_maxLength == pusch_len1)) antenna_ports_bits_ul = 2;
+
if ((transformPrecoder == transformPrecoder_enabled) && (dmrs_UplinkConfig.pusch_maxLength == pusch_len2)) antenna_ports_bits_ul = 4;
+
if ((transformPrecoder == transformPrecoder_disabled) && (dmrs_UplinkConfig.pusch_maxLength == pusch_len1)) antenna_ports_bits_ul = 3;
+
if ((transformPrecoder == transformPrecoder_disabled) && (dmrs_UplinkConfig.pusch_maxLength == pusch_len2)) antenna_ports_bits_ul = 4;
}
- if((dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type2)){
+
+ if((dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type2)) {
if ((transformPrecoder == transformPrecoder_disabled) && (dmrs_UplinkConfig.pusch_maxLength == pusch_len1)) antenna_ports_bits_ul = 4;
+
if ((transformPrecoder == transformPrecoder_disabled) && (dmrs_UplinkConfig.pusch_maxLength == pusch_len2)) antenna_ports_bits_ul = 5;
}
+
// for format 1_1 number of bits as defined by Tables 7.3.1.2.2-1/2/3/4
uint8_t antenna_ports_bits_dl = 0;
+
if((dmrs_DownlinkConfig.pdsch_dmrs_type == pdsch_dmrs_type1) && (dmrs_DownlinkConfig.pdsch_maxLength == pdsch_len1)) antenna_ports_bits_dl = 4; // Table 7.3.1.2.2-1
+
if((dmrs_DownlinkConfig.pdsch_dmrs_type == pdsch_dmrs_type1) && (dmrs_DownlinkConfig.pdsch_maxLength == pdsch_len2)) antenna_ports_bits_dl = 5; // Table 7.3.1.2.2-2
+
if((dmrs_DownlinkConfig.pdsch_dmrs_type == pdsch_dmrs_type2) && (dmrs_DownlinkConfig.pdsch_maxLength == pdsch_len1)) antenna_ports_bits_dl = 5; // Table 7.3.1.2.2-3
+
if((dmrs_DownlinkConfig.pdsch_dmrs_type == pdsch_dmrs_type2) && (dmrs_DownlinkConfig.pdsch_maxLength == pdsch_len2)) antenna_ports_bits_dl = 6; // Table 7.3.1.2.2-4
// 39 TCI
uint8_t tci_bits=0;
+
if (pdcch_vars2->coreset[p].tciPresentInDCI == tciPresentInDCI_enabled) tci_bits=3;
// 42 CSI_REQUEST
// reportTriggerSize is defined in the CSI-MeasConfig IE (TS 38.331).
// Size of CSI request field in DCI (bits). Corresponds to L1 parameter 'ReportTriggerSize' (see 38.214, section 5.2)
uint8_t reportTriggerSize = csi_MeasConfig.reportTriggerSize; // value from 0..6
-
// 43 CBGTI
// for format 0_1
uint8_t maxCodeBlockGroupsPerTransportBlock = 0;
+
if (PUSCH_ServingCellConfig.maxCodeBlockGroupsPerTransportBlock != 0)
maxCodeBlockGroupsPerTransportBlock = (uint8_t)PUSCH_ServingCellConfig.maxCodeBlockGroupsPerTransportBlock;
+
// for format 1_1, as defined in Subclause 5.1.7 of [6, TS38.214]
uint8_t maxCodeBlockGroupsPerTransportBlock_dl = 0;
+
if (PDSCH_ServingCellConfig.maxCodeBlockGroupsPerTransportBlock_dl != 0)
maxCodeBlockGroupsPerTransportBlock_dl = pdsch_config.maxNrofCodeWordsScheduledByDCI; // FIXME!!!
// 44 CBGFI
uint8_t cbgfi_bit = PDSCH_ServingCellConfig.codeBlockGroupFlushIndicator;
-
// 45 PTRS_DMRS
// 0 bit if PTRS-UplinkConfig is not configured and transformPrecoder=disabled, or if transformPrecoder=enabled, or if maxRank=1
// 2 bits otherwise
uint8_t ptrs_dmrs_bits=0; //FIXME!!!
-
// 46 BETA_OFFSET_IND
// at IE PUSCH-Config, beta_offset indicator – 0 if the higher layer parameter betaOffsets = semiStatic; otherwise 2 bits
// uci-OnPUSCH
// Selection between and configuration of dynamic and semi-static beta-offset. If the field is absent or released, the UE applies the value 'semiStatic' and the BetaOffsets
uint8_t betaOffsets = 0;
+
if (pusch_config.uci_onPusch.betaOffset_type == betaOffset_semiStatic);
+
if (pusch_config.uci_onPusch.betaOffset_type == betaOffset_dynamic) betaOffsets = 2;
// 47 DMRS_SEQ_INI
uint8_t dmrs_seq_ini_bits_ul = 0;
uint8_t dmrs_seq_ini_bits_dl = 0;
+
//1 bit if both scramblingID0 and scramblingID1 are configured in DMRS-UplinkConfig
if ((transformPrecoder == transformPrecoder_disabled) && (dmrs_UplinkConfig.scramblingID0 != 0) && (dmrs_UplinkConfig.scramblingID1 != 0)) dmrs_seq_ini_bits_ul = 1;
+
//1 bit if both scramblingID0 and scramblingID1 are configured in DMRS-DownlinkConfig
if ((dmrs_DownlinkConfig.scramblingID0 != 0) && (dmrs_DownlinkConfig.scramblingID0 != 0)) dmrs_seq_ini_bits_dl = 1;
@@ -2349,49 +2390,68 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
// 40 SRS_REQUEST
// 41 TPC_CMD
uint8_t tpc_cmd_bit_2_3 = 0;
-
uint8_t dci_field_size_table [NBR_NR_DCI_FIELDS][NBR_NR_FORMATS] = { // This table contains the number of bits for each field (row) contained in each dci format (column).
// The values of the variables indicate field sizes in number of bits
//Format0_0 Format0_1 Format1_0 Format1_1 Formats2_0/1/2/3
- {1, 1, (((crc_scrambled == _p_rnti) || (crc_scrambled == _si_rnti) || (crc_scrambled == _ra_rnti)) ? 0:1),
- 1, 0,0,0,0}, // 0 IDENTIFIER_DCI_FORMATS:
- {0, ((crossCarrierSchedulingConfig_ind == 0) ? 0:3),
- 0, ((crossCarrierSchedulingConfig_ind == 0) ? 0:3),
- 0,0,0,0}, // 1 CARRIER_IND: 0 or 3 bits, as defined in Subclause x.x of [5, TS38.213]
+ {
+ 1, 1, (((crc_scrambled == _p_rnti) || (crc_scrambled == _si_rnti) || (crc_scrambled == _ra_rnti)) ? 0:1),
+ 1, 0,0,0,0
+ }, // 0 IDENTIFIER_DCI_FORMATS:
+ {
+ 0, ((crossCarrierSchedulingConfig_ind == 0) ? 0:3),
+ 0, ((crossCarrierSchedulingConfig_ind == 0) ? 0:3),
+ 0,0,0,0
+ }, // 1 CARRIER_IND: 0 or 3 bits, as defined in Subclause x.x of [5, TS38.213]
{0, (sul_ind == 0)?0:1, 0, 0, 0,0,0,0}, // 2 SUL_IND_0_1:
{0, 0, 0, 0, 1,0,0,0}, // 3 SLOT_FORMAT_IND: size of DCI format 2_0 is configurable by higher layers up to 128 bits, according to Subclause 11.1.1 of [5, TS 38.213]
{0, 0, 0, 0, 0,1,0,0}, // 4 PRE_EMPTION_IND: size of DCI format 2_1 is configurable by higher layers up to 126 bits, according to Subclause 11.2 of [5, TS 38.213]. Each pre-emption indication is 14 bits
{0, 0, 0, 0, 0,0,0,0}, // 5 BLOCK_NUMBER: starting position of a block is determined by the parameter startingBitOfFormat2_3
{0, 0, 0, 0, 0,0,1,0}, // 6 CLOSE_LOOP_IND
- {0, (uint8_t)ceil(log2(n_UL_BWP_RRC)),
- 0, (uint8_t)ceil(log2(n_DL_BWP_RRC)),
- 0,0,0,0}, // 7 BANDWIDTH_PART_IND:
- {0, 0, ((crc_scrambled == _p_rnti) ? 2:0),
- 0, 0,0,0,0}, // 8 SHORT_MESSAGE_IND 2 bits if crc scrambled with P-RNTI
- {0, 0, ((crc_scrambled == _p_rnti) ? 8:0),
- 0, 0,0,0,0}, // 9 SHORT_MESSAGES 8 bit8 if crc scrambled with P-RNTI
- {(uint8_t)(ceil(log2(n_RB_ULBWP*(n_RB_ULBWP+1)/2)))-n_UL_hopping,
- n_bits_freq_dom_res_assign_ul,
- 0, 0, 0,0,0,0}, // 10 FREQ_DOM_RESOURCE_ASSIGNMENT_UL: PUSCH hopping with resource allocation type 1 not considered
+ {
+ 0, (uint8_t)ceil(log2(n_UL_BWP_RRC)),
+ 0, (uint8_t)ceil(log2(n_DL_BWP_RRC)),
+ 0,0,0,0
+ }, // 7 BANDWIDTH_PART_IND:
+ {
+ 0, 0, ((crc_scrambled == _p_rnti) ? 2:0),
+ 0, 0,0,0,0
+ }, // 8 SHORT_MESSAGE_IND 2 bits if crc scrambled with P-RNTI
+ {
+ 0, 0, ((crc_scrambled == _p_rnti) ? 8:0),
+ 0, 0,0,0,0
+ }, // 9 SHORT_MESSAGES 8 bit8 if crc scrambled with P-RNTI
+ {
+ (uint8_t)(ceil(log2(n_RB_ULBWP*(n_RB_ULBWP+1)/2)))-n_UL_hopping,
+ n_bits_freq_dom_res_assign_ul,
+ 0, 0, 0,0,0,0
+ }, // 10 FREQ_DOM_RESOURCE_ASSIGNMENT_UL: PUSCH hopping with resource allocation type 1 not considered
// (NOTE 1) If DCI format 0_0 is monitored in common search space
// and if the number of information bits in the DCI format 0_0 prior to padding
// is larger than the payload size of the DCI format 1_0 monitored in common search space
// the bitwidth of the frequency domain resource allocation field in the DCI format 0_0
// is reduced such that the size of DCI format 0_0 equals to the size of the DCI format 1_0
- {0, 0, (uint8_t)ceil(log2(n_RB_DLBWP*(n_RB_DLBWP+1)/2)),
- n_bits_freq_dom_res_assign_dl,
- 0,0,0,0}, // 11 FREQ_DOM_RESOURCE_ASSIGNMENT_DL:
- {4, (uint8_t)log2(pusch_alloc_list),
- 4, (uint8_t)log2(pdsch_alloc_list),
- 0,0,0,0}, // 12 TIME_DOM_RESOURCE_ASSIGNMENT: 0, 1, 2, 3, or 4 bits as defined in Subclause 6.1.2.1 of [6, TS 38.214]. The bitwidth for this field is determined as log2(I) bits,
+ {
+ 0, 0, (uint8_t)ceil(log2(n_RB_DLBWP*(n_RB_DLBWP+1)/2)),
+ n_bits_freq_dom_res_assign_dl,
+ 0,0,0,0
+ }, // 11 FREQ_DOM_RESOURCE_ASSIGNMENT_DL:
+ {
+ 4, (uint8_t)log2(pusch_alloc_list),
+ 4, (uint8_t)log2(pdsch_alloc_list),
+ 0,0,0,0
+ }, // 12 TIME_DOM_RESOURCE_ASSIGNMENT: 0, 1, 2, 3, or 4 bits as defined in Subclause 6.1.2.1 of [6, TS 38.214]. The bitwidth for this field is determined as log2(I) bits,
// where I the number of entries in the higher layer parameter pusch-AllocationList
- {0, 0, 1, (((dl_res_alloc_type_0==1)&&(dl_res_alloc_type_1==0))?0:1),
- 0,0,0,0}, // 13 VRB_TO_PRB_MAPPING: 0 bit if only resource allocation type 0
+ {
+ 0, 0, 1, (((dl_res_alloc_type_0==1) &&(dl_res_alloc_type_1==0))?0:1),
+ 0,0,0,0
+ }, // 13 VRB_TO_PRB_MAPPING: 0 bit if only resource allocation type 0
{0, 0, 0, prb_BundlingType_size, 0,0,0,0}, // 14 PRB_BUNDLING_SIZE_IND:0 bit if the higher layer parameter PRB_bundling is not configured or is set to 'static', or 1 bit if the higher layer parameter PRB_bundling is set to 'dynamic' according to Subclause 5.1.2.3 of [6, TS 38.214]
{0, 0, 0, rateMatching_bits, 0,0,0,0}, // 15 RATE_MATCHING_IND: 0, 1, or 2 bits according to higher layer parameter rate-match-PDSCH-resource-set
{0, 0, 0, n_zp_bits, 0,0,0,0}, // 16 ZP_CSI_RS_TRIGGER:
- {1, (((ul_res_alloc_type_0==1)&&(ul_res_alloc_type_1==0))||(freqHopping == 0))?0:1,
- 0, 0, 0,0,0,0}, // 17 FREQ_HOPPING_FLAG: 0 bit if only resource allocation type 0
+ {
+ 1, (((ul_res_alloc_type_0==1) &&(ul_res_alloc_type_1==0))||(freqHopping == 0))?0:1,
+ 0, 0, 0,0,0,0
+ }, // 17 FREQ_HOPPING_FLAG: 0 bit if only resource allocation type 0
{0, 0, 0, 5, 0,0,0,0}, // 18 TB1_MCS:
{0, 0, 0, 1, 0,0,0,0}, // 19 TB1_NDI:
{0, 0, 0, 2, 0,0,0,0}, // 20 TB1_RV:
@@ -2400,17 +2460,23 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
{0, 0, 0, 2, 0,0,0,0}, // 23 TB2_RV:
{5, 5, 5, 0, 0,0,0,0}, // 24 MCS:
{1, 1, (crc_scrambled == _c_rnti)?1:0,0, 0,0,0,0}, // 25 NDI:
- {2, 2, (((crc_scrambled == _c_rnti) || (crc_scrambled == _si_rnti)) ? 2:0),
- 0, 0,0,0,0}, // 26 RV:
+ {
+ 2, 2, (((crc_scrambled == _c_rnti) || (crc_scrambled == _si_rnti)) ? 2:0),
+ 0, 0,0,0,0
+ }, // 26 RV:
{4, 4, (crc_scrambled == _c_rnti)?4:0,4, 0,0,0,0}, // 27 HARQ_PROCESS_NUMBER:
{0, 0, (crc_scrambled == _c_rnti)?2:0,n_dai, 0,0,0,0}, // 28 DAI: For format1_1: 4 if more than one serving cell are configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 MSB bits are the counter DAI and the 2 LSB bits are the total DAI
// 2 if one serving cell is configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 bits are the counter DAI
// 0 otherwise
{0, codebook_HARQ_ACK, 0, 0, 0,0,0,0}, // 29 FIRST_DAI: (1 or 2 bits) 1 bit for semi-static HARQ-ACK // 2 bits for dynamic HARQ-ACK codebook with single HARQ-ACK codebook
- {0, (((codebook_HARQ_ACK == 2) && (n_HARQ_ACK_sub_codebooks==2))?2:0),
- 0, 0, 0,0,0,0}, // 30 SECOND_DAI: (0 or 2 bits) 2 bits for dynamic HARQ-ACK codebook with two HARQ-ACK sub-codebooks // 0 bits otherwise
- {0, 0, (((crc_scrambled == _p_rnti) || (crc_scrambled == _ra_rnti)) ? 2:0),
- 0, 0,0,0,0}, // 31 TB_SCALING
+ {
+ 0, (((codebook_HARQ_ACK == 2) &&(n_HARQ_ACK_sub_codebooks==2))?2:0),
+ 0, 0, 0,0,0,0
+ }, // 30 SECOND_DAI: (0 or 2 bits) 2 bits for dynamic HARQ-ACK codebook with two HARQ-ACK sub-codebooks // 0 bits otherwise
+ {
+ 0, 0, (((crc_scrambled == _p_rnti) || (crc_scrambled == _ra_rnti)) ? 2:0),
+ 0, 0,0,0,0
+ }, // 31 TB_SCALING
{2, 2, 0, 0, 0,0,0,0}, // 32 TPC_PUSCH:
{0, 0, (crc_scrambled == _c_rnti)?2:0,2, 0,0,0,0}, // 33 TPC_PUCCH:
{0, 0, (crc_scrambled == _c_rnti)?3:0,3, 0,0,0,0}, // 34 PUCCH_RESOURCE_IND:
@@ -2420,13 +2486,17 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
{0, antenna_ports_bits_ul, 0, antenna_ports_bits_dl, 0,0,0,0}, // 38 ANTENNA_PORTS:
{0, 0, 0, tci_bits, 0,0,0,0}, // 39 TCI: 0 bit if higher layer parameter tci-PresentInDCI is not enabled; otherwise 3 bits
{0, (sul_ind == 0)?2:3, 0, (sul_ind == 0)?2:3, 0,0,0,2}, // 40 SRS_REQUEST:
- {0, 0, 0, 0, 0,0,tpc_cmd_bit_2_2,
- tpc_cmd_bit_2_3},
+ {
+ 0, 0, 0, 0, 0,0,tpc_cmd_bit_2_2,
+ tpc_cmd_bit_2_3
+ },
// 41 TPC_CMD:
{0, reportTriggerSize, 0, 0, 0,0,0,0}, // 42 CSI_REQUEST:
- {0, maxCodeBlockGroupsPerTransportBlock,
- 0, maxCodeBlockGroupsPerTransportBlock_dl,
- 0,0,0,0}, // 43 CBGTI: 0, 2, 4, 6, or 8 bits determined by higher layer parameter maxCodeBlockGroupsPerTransportBlock for the PDSCH
+ {
+ 0, maxCodeBlockGroupsPerTransportBlock,
+ 0, maxCodeBlockGroupsPerTransportBlock_dl,
+ 0,0,0,0
+ }, // 43 CBGTI: 0, 2, 4, 6, or 8 bits determined by higher layer parameter maxCodeBlockGroupsPerTransportBlock for the PDSCH
{0, 0, 0, cbgfi_bit, 0,0,0,0}, // 44 CBGFI: 0 or 1 bit determined by higher layer parameter codeBlockGroupFlushIndicator
{0, ptrs_dmrs_bits, 0, 0, 0,0,0,0}, // 45 PTRS_DMRS:
{0, betaOffsets, 0, 0, 0,0,0,0}, // 46 BETA_OFFSET_IND:
@@ -2444,13 +2514,13 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
{0, 0, 0, 0, 0,0,0,0}, // 52 SUL_IND_1_0 (random access procedure initiated by a PDCCH order not implemented, FIXME!!!)
{0, 0, 0, 0, 0,0,0,0}, // 53 SS_PBCH_INDEX (random access procedure initiated by a PDCCH order not implemented, FIXME!!!)
{0, 0, 0, 0, 0,0,0,0}, // 54 PRACH_MASK_INDEX (random access procedure initiated by a PDCCH order not implemented, FIXME!!!)
- {0, 0, ((crc_scrambled == _p_rnti)?6:(((crc_scrambled == _si_rnti) || (crc_scrambled == _ra_rnti))?16:0)),
- 0, 0,0,0,0} // 55 RESERVED_NR_DCI
+ {
+ 0, 0, ((crc_scrambled == _p_rnti)?6:(((crc_scrambled == _si_rnti) || (crc_scrambled == _ra_rnti))?16:0)),
+ 0, 0,0,0,0
+ } // 55 RESERVED_NR_DCI
};
-
// NOTE 1: adjustments in freq_dom_resource_assignment_UL to be done if necessary
// NOTE 2: adjustments in padding to be done if necessary
-
uint8_t dci_size [8] = {0,0,0,0,0,0,0,0}; // will contain size for each format
for (int i=0 ; i dci_size[2])){
+ if ((dci_field_size_table[SUL_IND_0_0][0] == 1) && (dci_size[0] > dci_size[2])) {
dci_field_size_table[SUL_IND_0_0][0] = 0;
dci_size[0]=dci_size[0]-1;
}
+
// if ((format == format0_0) || (format == format1_0)) {
// According to Section 7.3.1.1.1 in TS 38.212
// If DCI format 0_0 is monitored in common search space and if the number of information bits in the DCI format 0_0 prior to padding
@@ -2503,6 +2580,7 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
#endif
//}
}
+
// If DCI format 0_0 is monitored in common search space and if the number of information bits in the DCI format 0_0 prior to padding
// is larger than the payload size of the DCI format 1_0 monitored in common search space for scheduling the same serving cell,
// the bitwidth of the frequency domain resource allocation field in the DCI format 0_0 is reduced
@@ -2528,20 +2606,20 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
* Not implemented. FIXME!!!
*
*/
-
-
// }
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_format_size) dci_fields_sizes[][] = { \n");
- for (int j=0; jpdcch_vars[ue->current_thread_id[nr_tti_rx]];
NR_UE_PDCCH *pdcch_vars2 = ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id];
uint16_t pdcch_DMRS_scrambling_id = pdcch_vars2->coreset[p].pdcchDMRSScramblingID;
uint64_t coreset_freq_dom = pdcch_vars2->coreset[p].frequencyDomainResources;
int coreset_time_dur = pdcch_vars2->coreset[p].duration;
uint16_t coreset_nbr_rb=0;
+
for (int i = 0; i < 45; i++) {
// this loop counts each bit of the bit map coreset_freq_dom, and increments nbr_RB_coreset for each bit set to '1'
if (((coreset_freq_dom & 0x1FFFFFFFFFFF) >> i) & 0x1) coreset_nbr_rb++;
}
+
coreset_nbr_rb = 6 * coreset_nbr_rb;
// coreset_time_dur,coreset_nbr_rb,
NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
//uint8_t mi;// = get_mi(&ue->frame_parms, nr_tti_rx);
-
//uint8_t tmode = ue->transmission_mode[eNB_id];
//uint8_t frame_type = frame_parms->frame_type;
-
uint8_t format_0_0_1_0_size_bits = 0, format_0_0_1_0_size_bytes = 0; //FIXME
uint8_t format_0_1_1_1_size_bits = 0, format_0_1_1_1_size_bytes = 0; //FIXME
uint8_t format_2_0_size_bits = 0, format_2_0_size_bytes = 0; //FIXME
uint8_t format_2_1_size_bits = 0, format_2_1_size_bytes = 0; //FIXME
uint8_t format_2_2_size_bits = 0, format_2_2_size_bytes = 0; //FIXME
uint8_t format_2_3_size_bits = 0, format_2_3_size_bytes = 0; //FIXME
-
/*
*
* The implementation of this function will depend on the information given by the searchSpace IE
@@ -2616,32 +2690,29 @@ uint8_t nr_dci_decoding_procedure(int s,
* Implementation according to 38.213 v15.1.0 Section 10.
*
*/
-
NR_UE_SEARCHSPACE_CSS_DCI_FORMAT_t css_dci_format = pdcch_vars2->searchSpace[s].searchSpaceType.common_dci_formats; //FIXME!!!
NR_UE_SEARCHSPACE_USS_DCI_FORMAT_t uss_dci_format = pdcch_vars2->searchSpace[s].searchSpaceType.ue_specific_dci_formats; //FIXME!!!
-
// The following initialization is only for test purposes. To be removed
// NR_UE_SEARCHSPACE_CSS_DCI_FORMAT_t
css_dci_format = cformat0_0_and_1_0;
//NR_UE_SEARCHSPACE_USS_DCI_FORMAT_t
uss_dci_format = uformat0_0_and_1_0;
-
/*
* Possible overlap between RE for SS/PBCH blocks (described in section 10, 38.213) has not been implemented yet
* This can be implemented by setting variable 'mode = NO_DCI' when overlap occurs
*/
//dci_detect_mode_t mode = 3; //dci_detect_mode_select(&ue->frame_parms, nr_tti_rx);
-
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure)-> searSpaceType=%d\n",do_common);
+
if (do_common==0) {
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure)-> css_dci_format=%d\n",css_dci_format);
} else {
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure)-> uss_dci_format=%d\n",uss_dci_format);
}
+
#endif
-
-
+
// A set of PDCCH candidates for a UE to monitor is defined in terms of PDCCH search spaces
if (do_common==0) { // COMMON SearchSpaceType assigned to current SearchSpace/CORESET
// Type0-PDCCH common search space for a DCI format with CRC scrambled by a SI-RNTI
@@ -2664,39 +2735,41 @@ uint8_t nr_dci_decoding_procedure(int s,
// FIXME
// We shall consider Table 10.1-1 to calculate the blind decoding only for Type0/Type0A/Type2-PDCCH
// Shall we consider the nrofCandidates in SearSpace IE that considers Aggregation Levels 1,2,4,8,16? Our implementation considers Table 10.1-1
-
// blind decoding (Type0-PDCCH,Type0A-PDCCH,Type1-PDCCH,Type2-PDCCH)
// for format0_0 => we are NOT implementing format0_0 for common search spaces. FIXME!
-
// for format0_0 and format1_0, first we calculate dci pdu size
format_0_0_1_0_size_bits = nr_dci_format_size(ue,eNB_id,nr_tti_rx,p,_c_rnti,n_RB_ULBWP,n_RB_DLBWP,dci_fields_sizes,0);
format_0_0_1_0_size_bytes = (format_0_0_1_0_size_bits%8 == 0) ? (uint8_t)floor(format_0_0_1_0_size_bits/8) : (uint8_t)(floor(format_0_0_1_0_size_bits/8) + 1);
#ifdef NR_PDCCH_DCI_DEBUG
printf("\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure)-> calculating dci format size for common searchSpaces with format css_dci_format=%d, format_0_0_1_0_size_bits=%d, format_0_0_1_0_size_bytes=%d\n",
- css_dci_format,format_0_0_1_0_size_bits,format_0_0_1_0_size_bytes);
+ css_dci_format,format_0_0_1_0_size_bits,format_0_0_1_0_size_bytes);
#endif
- for (int aggregationLevel = 3; aggregationLevel<4 ; aggregationLevel++) { // We fix aggregationLevel to 3 for testing=> nbr of CCE=8
- //for (int aggregationLevel = 2; aggregationLevel<5 ; aggregationLevel++) {
- // for aggregation level aggregationLevel. The number of candidates (for L2= 2^aggregationLevel) will be calculated in function nr_dci_decoding_procedure0
+
+ for (int aggregationLevel = 0; aggregationLevel<5 ; aggregationLevel++) { // We fix aggregationLevel to 3 for testing=> nbr of CCE=8
+ //for (int aggregationLevel = 2; aggregationLevel<5 ; aggregationLevel++) {
+ // for aggregation level aggregationLevel. The number of candidates (for L2= 2^aggregationLevel) will be calculated in function nr_dci_decoding_procedure0
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure)-> common searchSpaces with format css_dci_format=%d and aggregation_level=%d\n",
- css_dci_format,(1< common searchSpaces with format css_dci_format=%d and aggregation_level=%d\n",
+ css_dci_format,(1<current_thread_id[nr_tti_rx], frame_parms,
- crc_scrambled_values, aggregationLevel,
- cformat0_0_and_1_0, uformat0_0_and_1_0,
- format_0_0_1_0_size_bits, format_0_0_1_0_size_bytes, &dci_cnt,
- &crc_scrambled_, &format_found_, pdcch_DMRS_scrambling_id,&CCEmap0, &CCEmap1, &CCEmap2);
- if (dci_cnt != old_dci_cnt){
- // we will exit the loop as we have found the DCI
- aggregationLevel = 5;
- format_0_0_1_0_size_bits = nr_dci_format_size(ue,eNB_id,nr_tti_rx,p,crc_scrambled_,n_RB_ULBWP,n_RB_DLBWP,dci_fields_sizes,0); // after decoding dci successfully we recalculate dci pdu size with correct crc scrambled to get the right field sizes
- old_dci_cnt = dci_cnt;
- for (int i=0; icurrent_thread_id[nr_tti_rx], frame_parms,
+ crc_scrambled_values, aggregationLevel,
+ cformat0_0_and_1_0, uformat0_0_and_1_0,
+ format_0_0_1_0_size_bits, format_0_0_1_0_size_bytes, &dci_cnt,
+ &crc_scrambled_, &format_found_, pdcch_DMRS_scrambling_id,&CCEmap0, &CCEmap1, &CCEmap2);
+
+ if (dci_cnt != old_dci_cnt) {
+ // we will exit the loop as we have found the DCI
+ aggregationLevel = 5;
+ format_0_0_1_0_size_bits = nr_dci_format_size(ue,eNB_id,nr_tti_rx,p,crc_scrambled_,n_RB_ULBWP,n_RB_DLBWP,dci_fields_sizes,
+ 0); // after decoding dci successfully we recalculate dci pdu size with correct crc scrambled to get the right field sizes
+ old_dci_cnt = dci_cnt;
+
+ for (int i=0; i calculating dci format size for common searchSpaces with format css_dci_format=%d, format2_0_size_bits=%d, format2_0_size_bytes=%d\n",
- css_dci_format,format_2_0_size_bits,format_2_0_size_bytes);
+ css_dci_format,format_2_0_size_bits,format_2_0_size_bytes);
#endif
- for (int aggregationLevelSFI = 0; aggregationLevelSFI<5 ; aggregationLevelSFI++){
+
+ for (int aggregationLevelSFI = 0; aggregationLevelSFI<5 ; aggregationLevelSFI++) {
#ifdef NR_PDCCH_DCI_DEBUG
- printf("\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure)-> common searchSpaces with format css_dci_format=%d and aggregation_level=%d\n",
- css_dci_format,(1<