X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=fhi_lib%2Ftest%2Ftest_xran%2Fc_plane_tests.cc;h=79b87c4405d5efe5bac4f35394a7a77ff10868a5;hb=HEAD;hp=8319306727d5dafe7f226ee070722f5408cd76f5;hpb=2fbf70096f64af622da983e88c5a64e90ad9bdbd;p=o-du%2Fphy.git diff --git a/fhi_lib/test/test_xran/c_plane_tests.cc b/fhi_lib/test/test_xran/c_plane_tests.cc index 8319306..79b87c4 100644 --- a/fhi_lib/test/test_xran/c_plane_tests.cc +++ b/fhi_lib/test/test_xran/c_plane_tests.cc @@ -1,6 +1,6 @@ /****************************************************************************** * -* Copyright (c) 2019 Intel. +* Copyright (c) 2020 Intel. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,16 @@ #include +#define DELETE_ARRAY(x) { if(x) { delete[] x; x = nullptr; } } + +#define XRAN_MAX_BUFLEN_EXT11 (MAX_RX_LEN - \ + (RTE_PKTMBUF_HEADROOM \ + + sizeof(struct xran_ecpri_hdr) \ + + sizeof(struct xran_cp_radioapp_common_header) \ + + sizeof(struct xran_cp_radioapp_section1) \ + + sizeof(union xran_cp_radioapp_section_ext6) \ + + sizeof(union xran_cp_radioapp_section_ext10) \ + )) const std::string module_name = "C-Plane"; @@ -37,13 +47,23 @@ extern "C" { /* wrapper function for performace tests to reset mbuf */ -int xran_ut_prepare_cp(struct rte_mbuf *mbuf, struct xran_cp_gen_params *params, - uint8_t cc_id, uint8_t ant_id, uint8_t seq_id) +int xran_ut_prepare_cp(struct xran_cp_gen_params *params, + uint8_t cc_id, uint8_t ant_id, uint8_t seq_id, uint16_t start_sect_id) { - rte_pktmbuf_reset(mbuf); - return(xran_prepare_ctrl_pkt(mbuf, params, cc_id, ant_id, seq_id)); -} + int ret; + struct rte_mbuf *mbuf; + + mbuf = xran_ethdi_mbuf_alloc(); + if(mbuf == NULL) { + printf("Failed to allocate buffer!\n"); + return (-1); + } + ret = xran_prepare_ctrl_pkt(mbuf, params, cc_id, ant_id, seq_id, start_sect_id); + rte_pktmbuf_free(mbuf); + + return (ret); +} void cput_fh_rx_callback(void *pCallbackTag, xran_status_t status) { @@ -63,18 +83,54 @@ class C_plane: public KernelTests { private: struct xran_section_gen_info *m_pSectGenInfo = NULL; - struct xran_section_gen_info *m_pSectResult = NULL; - + struct xran_section_recv_info *m_pSectResult = NULL; + + struct sectinfo { + uint16_t sectionId; + uint8_t rb; + uint8_t symInc; + uint16_t startPrbc; + uint16_t numPrbc; + uint16_t reMask; + uint8_t numSymbol; + uint16_t beamId; + int freqOffset; + std::vector exts; + }; + + struct extcfginfo { + int type; + std::string name; + union { + struct xran_sectionext1_info ext1; + struct xran_sectionext2_info ext2; + struct xran_sectionext3_info ext3; + struct xran_sectionext4_info ext4; + struct xran_sectionext5_info ext5; + struct xran_sectionext6_info ext6; + struct xran_sectionext7_info ext7; + struct xran_sectionext8_info ext8; + struct xran_sectionext9_info ext9; + struct xran_sectionext10_info ext10; + struct xran_sectionext11_info ext11; + } u; + }; protected: int m_maxSections = 8; /* not used */ int m_numSections; - struct rte_mbuf *m_pTestBuffer; + struct rte_mbuf *m_pTestBuffer = nullptr; + struct xran_fh_config *m_fh_cfg; + struct xran_srs_config *m_srs_cfg; + struct xran_device_ctx m_xran_dev_ctx; struct xran_cp_gen_params m_params; struct xran_recv_packet_info m_pktInfo; - struct xran_cp_gen_params m_result; + struct xran_cp_recv_params m_result; + struct xran_prb_elm *m_prb_ele = nullptr; + + struct xran_sectionext1_info m_temp_ext1[XRAN_MAX_PRBS]; uint8_t m_dir; std::string m_dirStr; @@ -83,43 +139,49 @@ protected: uint8_t m_ccId, m_antId; uint8_t m_seqId; uint8_t m_frameId, m_subframeId, m_slotId; - uint8_t m_symStart, m_symNum; - uint16_t *m_prbStart = NULL, *m_prbNum = NULL; + uint8_t m_symStart; uint8_t m_iqWidth, m_compMethod; - uint16_t m_beamId; - uint16_t m_reMask = 0xfff; - uint16_t m_sectionId; uint8_t m_filterIndex; uint16_t m_timeOffset; uint8_t m_fftSize; uint8_t m_scs; uint16_t m_cpLength; - int m_freqOffset; + + uint32_t mb_free = MBUF_FREE; + + struct sectinfo *m_sections; + struct extcfginfo *m_extcfgs; + int m_nextcfgs; uint16_t m_ext1_dst_len = 0; - int8_t *m_p_ext1_dst = NULL; - int16_t *m_p_bfw_iq_src = NULL; + int8_t *m_p_ext1_dst = nullptr; + int16_t *m_p_bfw_iq_src = nullptr; struct xran_sectionext1_info m_ext1; - struct xran_sectionext2_info m_ext2; - struct xran_sectionext4_info m_ext4; - struct xran_sectionext5_info m_ext5; - - int16_t m_bfwIQ[XRAN_MAX_BFW_N*2]; + int m_antElmTRx; + struct rte_mbuf_ext_shared_info m_extSharedInfo; + uint8_t *m_pBfwIQ_ext = nullptr; + int16_t *m_pBfw_src[XRAN_MAX_SET_BFWS]; + int16_t m_pBfw_rx[XRAN_MAX_SET_BFWS][MAX_RX_LEN]; + struct xran_ext11_bfw_info m_bfwInfo[XRAN_MAX_SET_BFWS]; void SetUp() override { int i, j; + bool flag_skip; + int ext_type; + std::string ext_name; init_test("C_Plane"); - m_numSections = get_input_parameter("num_sections"); - ASSERT_FALSE(m_numSections == 0); - m_dirStr = get_input_parameter("direction"); + memset(&m_xran_dev_ctx, 0, sizeof(struct xran_device_ctx)); + m_srs_cfg = &m_xran_dev_ctx.srs_cfg; + m_fh_cfg = &m_xran_dev_ctx.fh_cfg; + if(!m_dirStr.compare("DL")) m_dir = XRAN_DIR_DL; else if(!m_dirStr.compare("UL")) m_dir = XRAN_DIR_UL; else FAIL() << "Invalid direction!"; @@ -136,24 +198,9 @@ protected: m_compMethod = get_input_parameter("comp_method"); m_iqWidth = get_input_parameter("iq_width"); - m_sectionId = get_input_parameter("section_id"); - m_symNum = get_input_parameter("symbol_num"); - m_beamId = get_input_parameter("beam_id"); - - /* reading configurations of start prb and the number of prbs */ - std::vector prbstart = get_input_parameter>("prb_start"); - std::vector prbnum = get_input_parameter>("prb_num"); - /* number of sections and the pair of start/number of prb shall be matched */ - ASSERT_TRUE((m_numSections == prbstart.size()) - && (m_numSections == prbnum.size()) - && (prbstart.size() == prbnum.size())); - - m_prbStart = new uint16_t [m_numSections]; - m_prbNum = new uint16_t [m_numSections]; - for(i=0; i < m_numSections; i++) { - m_prbStart[i] = prbstart[i]; - m_prbNum[i] = prbnum[i]; - } + m_xran_dev_ctx.interval_us_local = get_input_parameter("interval"); + m_srs_cfg->eAxC_offset = XRAN_MAX_ANTENNA_NR;//m_antId + 4; + m_fh_cfg->neAxc = m_antId + 1; switch(m_sectionType) { case XRAN_CP_SECTIONTYPE_1: @@ -166,158 +213,357 @@ protected: m_fftSize = get_input_parameter("fft_size"); m_scs = get_input_parameter("scs"); m_cpLength = get_input_parameter("cp_length"); - m_freqOffset = get_input_parameter("freq_offset"); break; default: - FAIL() << "Invalid Section Type - " << m_sectionType << "\n"; + FAIL() << "Invalid Section Type - " << m_sectionType << std::endl; + } + + m_numSections = get_input_subsection_size("sections"); + ASSERT_FALSE(m_numSections == 0); + + m_sections = new struct sectinfo [m_numSections]; + for(i=0; i("sections", i, "sectionId"); + m_sections[i].rb = get_input_parameter("sections", i, "rb"); + m_sections[i].symInc = get_input_parameter("sections", i, "symInc"); + m_sections[i].startPrbc = get_input_parameter("sections", i, "startPrbc"); + m_sections[i].numPrbc = get_input_parameter("sections", i, "numPrbc"); + m_sections[i].reMask = get_input_parameter("sections", i, "reMask"); + m_sections[i].numSymbol = get_input_parameter("sections", i, "numSymbol"); + m_sections[i].beamId = get_input_parameter("sections", i, "beamId"); + + switch(m_sectionType) { + case XRAN_CP_SECTIONTYPE_3: + m_sections[i].freqOffset = get_input_parameter("sections", i, "freqOffset"); + break; + } + + m_sections[i].exts = get_input_parameter>("sections", i, "exts"); } /* allocate and prepare required data storage */ - m_pSectGenInfo = new struct xran_section_gen_info [m_numSections]; + m_pSectGenInfo = new struct xran_section_gen_info [m_numSections]; ASSERT_NE(m_pSectGenInfo, nullptr); - m_params.sections = m_pSectGenInfo; + m_params.sections = m_pSectGenInfo; - m_pSectResult = new struct xran_section_gen_info [m_numSections]; + m_pSectResult = new struct xran_section_recv_info [m_numSections]; ASSERT_NE(m_pSectResult, nullptr); - m_result.sections = m_pSectResult; + m_result.sections = m_pSectResult; - m_ext1_dst_len = 9600; - m_p_ext1_dst = new int8_t [m_ext1_dst_len]; - m_p_bfw_iq_src = new int16_t [9600/2]; + /* reading configurations of section extension */ + m_nextcfgs = get_input_subsection_size("extensions"); + if(m_nextcfgs) { + m_extcfgs = new struct extcfginfo [m_nextcfgs]; - /* allocating an mbuf for packet generatrion */ - m_pTestBuffer = xran_ethdi_mbuf_alloc(); + flag_skip = false; + for(i=0; i < m_nextcfgs; i++) { + std::vector beamIDs; - ASSERT_FALSE(m_pTestBuffer == NULL); - } + ext_type = get_input_parameter("extensions", i, "type"); + switch(ext_type) { + case XRAN_CP_SECTIONEXTCMD_1: + { + /* if section extension type 1 is present, then ignore other extensions */ + if(i != 0 && m_nextcfgs != 1) { + std::cout << "### Extension 1 configuration, ignore other extensions !!\n" << std::endl; + } + flag_skip = true; + m_nextcfgs = 1; + i = 0; + m_extcfgs[i].u.ext1.bfwCompMeth = get_input_parameter ("extensions", i, "bfwCompMeth"); + m_extcfgs[i].u.ext1.bfwIqWidth = get_input_parameter ("extensions", i, "bfwIqWidth"); + m_antElmTRx = get_input_parameter ("extensions", i, "antelm_trx"); + struct xran_device_ctx * p_xran_dev_ctx = xran_dev_get_ctx(); + p_xran_dev_ctx->numSetBFWs_arr[0] = m_numSections; + break; + } + case XRAN_CP_SECTIONEXTCMD_2: + m_extcfgs[i].u.ext2.bfAzPtWidth = get_input_parameter("extensions", i, "bfAzPtWidth") & 0x7; + m_extcfgs[i].u.ext2.bfAzPt = get_input_parameter("extensions", i, "bfAzPt") & 0xf; + m_extcfgs[i].u.ext2.bfZePtWidth = get_input_parameter("extensions", i, "bfZePtWidth") & 0x7; + m_extcfgs[i].u.ext2.bfZePt = get_input_parameter("extensions", i, "bfZePt") & 0xf; + m_extcfgs[i].u.ext2.bfAz3ddWidth = get_input_parameter("extensions", i, "bfAz3ddWidth") & 0x7; + m_extcfgs[i].u.ext2.bfAz3dd = get_input_parameter("extensions", i, "bfAz3dd") & 0xf; + m_extcfgs[i].u.ext2.bfZe3ddWidth = get_input_parameter("extensions", i, "bfZe3ddWidth") & 0x7; + m_extcfgs[i].u.ext2.bfZe3dd = get_input_parameter("extensions", i, "bfZe3dd") & 0xf; + m_extcfgs[i].u.ext2.bfAzSI = get_input_parameter("extensions", i, "bfAzSI") & 0x7; + m_extcfgs[i].u.ext2.bfZeSI = get_input_parameter("extensions", i, "bfZeSI") & 0x7; + break; - void TearDown() override - { - int i, j; + case XRAN_CP_SECTIONEXTCMD_3: + m_extcfgs[i].u.ext3.codebookIdx = get_input_parameter ("extensions", i, "codebookIdx"); + m_extcfgs[i].u.ext3.layerId = get_input_parameter ("extensions", i, "layerId") & 0xf; + m_extcfgs[i].u.ext3.numLayers = get_input_parameter ("extensions", i, "numLayers") & 0xf; + m_extcfgs[i].u.ext3.txScheme = get_input_parameter ("extensions", i, "txScheme") & 0xf; + m_extcfgs[i].u.ext3.crsReMask = get_input_parameter("extensions", i, "crsReMask") & 0xfff; + m_extcfgs[i].u.ext3.crsShift = get_input_parameter ("extensions", i, "crsShift") & 0x1; + m_extcfgs[i].u.ext3.crsSymNum = get_input_parameter ("extensions", i, "crsSymNum") & 0xf; + m_extcfgs[i].u.ext3.numAntPort = get_input_parameter("extensions", i, "numAntPort"); + m_extcfgs[i].u.ext3.beamIdAP1 = get_input_parameter("extensions", i, "beamIdAP1"); + m_extcfgs[i].u.ext3.beamIdAP2 = get_input_parameter("extensions", i, "beamIdAP2"); + m_extcfgs[i].u.ext3.beamIdAP3 = get_input_parameter("extensions", i, "beamIdAP3"); + break; - if(m_pTestBuffer != NULL) - rte_pktmbuf_free(m_pTestBuffer); + case XRAN_CP_SECTIONEXTCMD_4: + m_extcfgs[i].u.ext4.csf = get_input_parameter ("extensions", i, "csf") & 0xf; + m_extcfgs[i].u.ext4.modCompScaler= get_input_parameter("extensions", i, "modCompScaler") & 0x7fff; + break; - if(m_prbStart) - delete[] m_prbStart; - if(m_prbNum) - delete[] m_prbNum; + case XRAN_CP_SECTIONEXTCMD_5: + { + std::vector csf; + std::vector mcScaleReMask; + std::vector mcScaleOffset; + + m_extcfgs[i].u.ext5.num_sets = get_input_parameter("extensions", i, "num_sets"); + if(m_extcfgs[i].u.ext5.num_sets > XRAN_MAX_MODCOMP_ADDPARMS) + FAIL() << "Invalid number of sets in extension 5!"; + + csf = get_input_parameter>("extensions", i, "csf"); + mcScaleReMask = get_input_parameter>("extensions", i, "mcScaleReMask"); + mcScaleOffset = get_input_parameter>("extensions", i, "mcScaleOffset"); + + if(csf.size() != m_extcfgs[i].u.ext5.num_sets + || mcScaleReMask.size() != m_extcfgs[i].u.ext5.num_sets + || mcScaleOffset.size() != m_extcfgs[i].u.ext5.num_sets) + FAIL() << "Invalid configuration in extension 5 - different size!"; + + for(j=0; j < m_extcfgs[i].u.ext5.num_sets; j++) { + m_extcfgs[i].u.ext5.mc[j].csf = csf[j]; + m_extcfgs[i].u.ext5.mc[j].mcScaleReMask = mcScaleReMask[j]; + m_extcfgs[i].u.ext5.mc[j].mcScaleOffset = mcScaleOffset[j]; + } + } + break; - if(m_p_bfw_iq_src) - delete[] m_p_bfw_iq_src; + case XRAN_CP_SECTIONEXTCMD_6: + m_extcfgs[i].u.ext6.rbgSize = get_input_parameter ("extensions", i, "rbgSize"); + m_extcfgs[i].u.ext6.rbgMask = get_input_parameter("extensions", i, "rbgMask"); + m_extcfgs[i].u.ext6.symbolMask = get_input_parameter("extensions", i, "symbolMask"); + break; - if(m_p_ext1_dst) - delete[] m_p_ext1_dst; + case XRAN_CP_SECTIONEXTCMD_9: + { + m_extcfgs[i].u.ext9.technology = get_input_parameter ("extensions", i, "technology"); + m_xran_dev_ctx.dssPeriod = 1; + } + break; + case XRAN_CP_SECTIONEXTCMD_10: + m_extcfgs[i].u.ext10.numPortc = get_input_parameter ("extensions", i, "numPortc"); + m_extcfgs[i].u.ext10.beamGrpType= get_input_parameter ("extensions", i, "beamGrpType"); + switch(m_extcfgs[i].u.ext10.beamGrpType) { + case XRAN_BEAMGT_COMMON: + case XRAN_BEAMGT_MATRIXIND: + break; + case XRAN_BEAMGT_VECTORLIST: + beamIDs = get_input_parameter>("extensions", i, "beamID"); + for(j=0; j < m_extcfgs[i].u.ext10.numPortc; j++) + m_extcfgs[i].u.ext10.beamID[j] = beamIDs[j]; + break; + default: + FAIL() << "Invalid Beam Group Type - " << m_extcfgs[i].u.ext10.beamGrpType << std::endl; + } + break; - if(m_pSectGenInfo) - delete[] m_pSectGenInfo; + case XRAN_CP_SECTIONEXTCMD_11: + { + int temp; + /* if section extension type 11 is present, then ignore other extensions */ + if(i != 0 && m_nextcfgs != 1) { + std::cout << "### Extension 11 configuration, ignore other extensions !!\n" << std::endl; + } + flag_skip = true; + m_nextcfgs = 1; + i = 0; + + m_extcfgs[i].u.ext11.RAD = get_input_parameter ("extensions", i, "RAD"); + m_extcfgs[i].u.ext11.disableBFWs = get_input_parameter ("extensions", i, "disableBFWs"); + m_extcfgs[i].u.ext11.numBundPrb = get_input_parameter ("extensions", i, "numBundPrb"); + m_extcfgs[i].u.ext11.bfwCompMeth = get_input_parameter ("extensions", i, "bfwCompMeth"); + m_extcfgs[i].u.ext11.bfwIqWidth = get_input_parameter ("extensions", i, "bfwIqWidth"); + m_extcfgs[i].u.ext11.numSetBFWs = get_input_parameter ("extensions", i, "numSetBFWs"); + m_antElmTRx = get_input_parameter ("extensions", i, "antelm_trx"); + beamIDs = get_input_parameter>("extensions", i, "beamID"); + + /* Allocate buffers */ + m_extcfgs[i].u.ext11.maxExtBufSize = MAX_RX_LEN; + m_pBfwIQ_ext = (uint8_t *)xran_malloc(m_extcfgs[i].u.ext11.maxExtBufSize); + m_extcfgs[i].u.ext11.pExtBuf = m_pBfwIQ_ext; + + for(j = 0; j < XRAN_MAX_SET_BFWS; j++) { + m_pBfw_src[j] = new int16_t [XRAN_MAX_BFW_N]; + memset(m_pBfw_src[j], j+1, XRAN_MAX_BFW_N); + } - if(m_pSectResult) { - delete[] m_pSectResult; - } + for(j=0; j < m_extcfgs[i].u.ext11.numSetBFWs; j++) { + m_bfwInfo[j].pBFWs = (uint8_t *)(m_pBfw_src[j]); + m_bfwInfo[j].beamId = beamIDs[j]; + } - } + /* Initialize Shared information for external buffer */ + m_extSharedInfo.free_cb = NULL; + m_extSharedInfo.fcb_opaque = NULL; + rte_mbuf_ext_refcnt_update(&m_extSharedInfo, 0); + m_extcfgs[i].u.ext11.pExtBufShinfo = &m_extSharedInfo; + + /* Check all BFWs can be fit with given buffer */ + temp = xran_cp_estimate_max_set_bfws(m_antElmTRx, m_extcfgs[i].u.ext11.bfwIqWidth, + m_extcfgs[i].u.ext11.bfwCompMeth, m_extcfgs[i].u.ext11.maxExtBufSize); + if(m_extcfgs[i].u.ext11.numSetBFWs > temp) { + FAIL() << "Too many sets of BFWs - " << m_extcfgs[i].u.ext11.numSetBFWs + << " (max " << temp << " for " << m_extcfgs[i].u.ext11.maxExtBufSize << std::endl; + } - int prepare_sections(bool extflag); - int prepare_extensions(int sect_num); - void verify_sections(void); + temp = xran_cp_prepare_ext11_bfws(m_extcfgs[i].u.ext11.numSetBFWs, m_antElmTRx, + m_extcfgs[i].u.ext11.bfwIqWidth, m_extcfgs[i].u.ext11.bfwCompMeth, + m_pBfwIQ_ext, XRAN_MAX_BUFLEN_EXT11, m_bfwInfo); + if(temp < 0) { + FAIL() << "Fail to prepare BFWs!" << std::endl; + }; + m_extcfgs[i].u.ext11.totalBfwIQLen = temp; + } + break; -}; + default: + FAIL() << "Invalid Section Type Extension - " << ext_type << std::endl; + continue; + } /* switch(ext_type) */ + m_extcfgs[i].type = ext_type; + m_extcfgs[i].name = get_input_parameter("extensions", i, "name"); + if(flag_skip) + break; + } /* for(i=0; i < m_nextcfgs; i++) */ + } + else { + m_extcfgs = nullptr; + } -int C_plane::prepare_extensions(int sect_num) -{ - int i, numext; - int N; + m_ext1_dst_len = 9600; + m_p_ext1_dst = new int8_t [m_ext1_dst_len]; + m_p_bfw_iq_src = new int16_t [9600/2]; + } + void TearDown() override + { + if(m_pTestBuffer != nullptr) { + rte_pktmbuf_free(m_pTestBuffer); + m_pTestBuffer = nullptr; + } - N = 8; + if(m_prb_ele){ + xran_free(m_prb_ele); + m_prb_ele = nullptr; + } - // extension 1 - m_ext1.bfwNumber = 4*N; // 4 ant, 8 UEs - m_ext1.bfwiqWidth = 16; - m_ext1.bfwCompMeth = XRAN_BFWCOMPMETHOD_NONE; - /* XRAN_BFWCOMPMETHOD_BLKFLOAT - * XRAN_BFWCOMPMETHOD_BLKSCALE - * XRAN_BFWCOMPMETHOD_ULAW - * XRAN_BFWCOMPMETHOD_BEAMSPACE - */ - m_ext1.p_bfwIQ = m_bfwIQ; + if(m_pBfwIQ_ext){ + xran_free(m_pBfwIQ_ext); + m_pBfwIQ_ext = nullptr; + } + for(int i = 0; i < XRAN_MAX_SET_BFWS; i++) { + DELETE_ARRAY(m_pBfw_src[i]); + } - switch (m_ext1.bfwCompMeth) { - case XRAN_BFWCOMPMETHOD_BLKFLOAT: - m_ext1.bfwCompParam.exponent = 0xa; - break; - case XRAN_BFWCOMPMETHOD_BLKSCALE: - m_ext1.bfwCompParam.blockScaler = 0xa5; - break; - case XRAN_BFWCOMPMETHOD_ULAW: - m_ext1.bfwCompParam.compBitWidthShift = 0x55; - case XRAN_BFWCOMPMETHOD_BEAMSPACE: - for(i=0; i= m_nextcfgs) { + std::cout << "Invalid section extension configuration index - " << ext_id << " [max " << m_nextcfgs-1 << "]" << std::endl; + return (-1); + } + + switch(m_extcfgs[ext_id].type) { + case XRAN_CP_SECTIONEXTCMD_1: +// std::cout << "Skip Extension 1 !!" << std::endl; + continue; + case XRAN_CP_SECTIONEXTCMD_2: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext2); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext2; + break; + case XRAN_CP_SECTIONEXTCMD_3: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext3); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext3; + break; + case XRAN_CP_SECTIONEXTCMD_4: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext4); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext4; + break; + case XRAN_CP_SECTIONEXTCMD_5: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext5); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext5; + break; + case XRAN_CP_SECTIONEXTCMD_6: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext6); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext6; + break; + case XRAN_CP_SECTIONEXTCMD_9: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext9); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext9; + break; + case XRAN_CP_SECTIONEXTCMD_10: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext10); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext10; + break; + case XRAN_CP_SECTIONEXTCMD_11: + m_params.sections[sect_num].exData[numext].len = sizeof(m_extcfgs[ext_id].u.ext11); + m_params.sections[sect_num].exData[numext].data = &m_extcfgs[ext_id].u.ext11; + + m_result.sections[sect_num].exts[numext].type = m_extcfgs[ext_id].type; + for(j=0 ; j < XRAN_MAX_SET_BFWS; j++) + m_result.sections[sect_num].exts[numext].u.ext11.bundInfo[j].pBFWs = (uint8_t *)m_pBfw_rx[j]; + + break; + default: + std::cout << "Invalid Section Extension Type - " << (int)m_extcfgs[ext_id].type << std::endl; + return (-1); + } /* switch(m_extcfgs[ext_id].type) */ + + m_params.sections[sect_num].exData[numext].type = m_extcfgs[ext_id].type; + numext++; + } /* for(i=0; i < m_sections[sect_num].exts.size(); i++) */ + + if(numext) { + m_params.sections[sect_num].exDataSize = numext; + m_params.sections[sect_num].info->ef = 1; + } + else { + m_params.sections[sect_num].exDataSize = 0; + m_params.sections[sect_num].info->ef = 0; + } + } /* for(sect_num=0; sect_num < m_numSections; sect_num++) */ return (0); } -int C_plane::prepare_sections(bool extflag) + +int C_plane::prepare_sections(void) { int numsec; @@ -350,40 +596,32 @@ int C_plane::prepare_sections(bool extflag) } for(numsec=0; numsec < m_numSections; numsec++) { - m_params.sections[numsec].info.type = m_params.sectionType; // for database - m_params.sections[numsec].info.startSymId = m_params.hdr.startSymId; // for database - m_params.sections[numsec].info.iqWidth = m_params.hdr.iqWidth; // for database - m_params.sections[numsec].info.compMeth = m_params.hdr.compMeth; // for database - m_params.sections[numsec].info.id = m_sectionId++; - m_params.sections[numsec].info.rb = XRAN_RBIND_EVERY; - m_params.sections[numsec].info.symInc = XRAN_SYMBOLNUMBER_NOTINC; - m_params.sections[numsec].info.startPrbc = m_prbStart[numsec]; - m_params.sections[numsec].info.numPrbc = m_prbNum[numsec]; - m_params.sections[numsec].info.numSymbol = m_symNum; - m_params.sections[numsec].info.reMask = m_reMask; - m_params.sections[numsec].info.beamId = m_beamId; + m_params.sections[numsec].info = new struct xran_section_info; + m_params.sections[numsec].info->type = m_params.sectionType; + m_params.sections[numsec].info->startSymId = m_params.hdr.startSymId; + m_params.sections[numsec].info->iqWidth = m_params.hdr.iqWidth; + m_params.sections[numsec].info->compMeth = m_params.hdr.compMeth; + m_params.sections[numsec].info->id = m_sections[numsec].sectionId; + m_params.sections[numsec].info->rb = m_sections[numsec].rb; + m_params.sections[numsec].info->symInc = m_sections[numsec].symInc; + m_params.sections[numsec].info->startPrbc = m_sections[numsec].startPrbc; + m_params.sections[numsec].info->numPrbc = m_sections[numsec].numPrbc; + m_params.sections[numsec].info->reMask = m_sections[numsec].reMask; + m_params.sections[numsec].info->numSymbol = m_sections[numsec].numSymbol; + m_params.sections[numsec].info->beamId = m_sections[numsec].beamId; + switch(m_sectionType) { case XRAN_CP_SECTIONTYPE_1: break; case XRAN_CP_SECTIONTYPE_3: - m_params.sections[numsec].info.freqOffset = m_freqOffset; + m_params.sections[numsec].info->freqOffset = m_sections[numsec].freqOffset; break; default: return (-1); } - - /* section extension */ - if(/*extflag == true*/0) { - m_params.sections[numsec].info.ef = 1; - prepare_extensions(numsec); - } - else { - m_params.sections[numsec].info.ef = 0; - m_params.sections[numsec].exDataSize = 0; - } - } + } m_params.numSections = numsec; @@ -393,7 +631,7 @@ int C_plane::prepare_sections(bool extflag) void C_plane::verify_sections(void) { - int i,j; + int i,j,k; /* Verify the result */ EXPECT_TRUE(m_result.dir == m_params.dir); @@ -420,37 +658,41 @@ void C_plane::verify_sections(void) default: FAIL() << "Invalid Section Type - " << m_sectionType << "\n"; } - + // printf("m_result.numSections = %d , m_params.numSections = %d\n",m_result.numSections,i,m_params.numSections); ASSERT_TRUE(m_result.numSections == m_params.numSections); for(i=0; i < m_result.numSections; i++) { - EXPECT_TRUE(m_result.sections[i].info.id == m_params.sections[i].info.id); - EXPECT_TRUE(m_result.sections[i].info.rb == XRAN_RBIND_EVERY); - EXPECT_TRUE(m_result.sections[i].info.symInc == XRAN_SYMBOLNUMBER_NOTINC); - EXPECT_TRUE(m_result.sections[i].info.startPrbc == m_params.sections[i].info.startPrbc); - EXPECT_TRUE(m_result.sections[i].info.numPrbc == m_params.sections[i].info.numPrbc); - EXPECT_TRUE(m_result.sections[i].info.numSymbol == m_params.sections[i].info.numSymbol); - EXPECT_TRUE(m_result.sections[i].info.reMask == m_params.sections[i].info.reMask); - EXPECT_TRUE(m_result.sections[i].info.beamId == m_params.sections[i].info.beamId); - EXPECT_TRUE(m_result.sections[i].info.ef == m_params.sections[i].info.ef); + // printf("m_result.sections[%d].info.id = %d , m_params.sections[%d].info.id = %d\n",i,m_result.sections[i].info.id,i,m_params.sections[i].info.id); + EXPECT_TRUE(m_result.sections[i].info.id == m_params.sections[i].info->id); + EXPECT_TRUE(m_result.sections[i].info.rb == m_params.sections[i].info->rb); + EXPECT_TRUE(m_result.sections[i].info.symInc == m_params.sections[i].info->symInc); + EXPECT_TRUE(m_result.sections[i].info.startPrbc == m_params.sections[i].info->startPrbc); + if(m_params.sections[i].info->numPrbc > 255) + EXPECT_TRUE(m_result.sections[i].info.numPrbc == 0); + else + EXPECT_TRUE(m_result.sections[i].info.numPrbc == m_params.sections[i].info->numPrbc); + EXPECT_TRUE(m_result.sections[i].info.numSymbol == m_params.sections[i].info->numSymbol); + EXPECT_TRUE(m_result.sections[i].info.reMask == m_params.sections[i].info->reMask); + EXPECT_TRUE(m_result.sections[i].info.beamId == m_params.sections[i].info->beamId); + EXPECT_TRUE(m_result.sections[i].info.ef == m_params.sections[i].info->ef); switch(m_sectionType) { case XRAN_CP_SECTIONTYPE_1: break; case XRAN_CP_SECTIONTYPE_3: - EXPECT_TRUE(m_result.sections[i].info.freqOffset == m_params.sections[i].info.freqOffset); + EXPECT_TRUE(m_result.sections[i].info.freqOffset == m_params.sections[i].info->freqOffset); break; default: FAIL() << "Invalid Section Type - " << m_sectionType << "\n"; } - if(m_params.sections[i].info.ef) { - // printf("[%d] %d == %d\n",i, m_result.sections[i].exDataSize, m_params.sections[i].exDataSize); - EXPECT_TRUE(m_result.sections[i].exDataSize == m_params.sections[i].exDataSize); + if(m_params.sections[i].info->ef) { + //printf("[%d] %d == %d\n",i, m_result.sections[i].exDataSize, m_params.sections[i].exDataSize); + EXPECT_TRUE(m_result.sections[i].numExts == m_params.sections[i].exDataSize); - for(j=0; j < m_params.sections[i].exDataSize; j++) { - EXPECT_TRUE(m_result.sections[i].exData[j].type == m_params.sections[i].exData[j].type); + for(j=0; j < (int)m_params.sections[i].exDataSize; j++) { + EXPECT_TRUE(m_result.sections[i].exts[j].type == m_params.sections[i].exData[j].type); switch(m_params.sections[i].exData[j].type) { case XRAN_CP_SECTIONEXTCMD_1: @@ -459,14 +701,15 @@ void C_plane::verify_sections(void) int iq_size, parm_size, N; ext1_params = (struct xran_sectionext1_info *)m_params.sections[i].exData[j].data; - ext1_result = (struct xran_sectionext1_info *)m_result.sections[i].exData[j].data; + ext1_result = &m_result.sections[i].exts[j].u.ext1; - EXPECT_TRUE(ext1_result->bfwiqWidth == ext1_params->bfwiqWidth); - EXPECT_TRUE(ext1_result->bfwCompMeth == ext1_params->bfwCompMeth); + EXPECT_TRUE(ext1_result->bfwIqWidth == ext1_params->bfwIqWidth); + EXPECT_TRUE(ext1_result->bfwCompMeth == ext1_params->bfwCompMeth); N = ext1_params->bfwNumber; switch(ext1_params->bfwCompMeth) { case XRAN_BFWCOMPMETHOD_BLKFLOAT: + //printf("[%d, %d] %d == %d\n",i, j, ext1_result->bfwCompParam.exponent, ext1_params->bfwCompParam.exponent); EXPECT_TRUE(ext1_result->bfwCompParam.exponent == ext1_params->bfwCompParam.exponent); break; @@ -485,11 +728,10 @@ void C_plane::verify_sections(void) } /* Get the number of BF weights */ - iq_size = N*ext1_params->bfwiqWidth*2; // total in bits + iq_size = N*ext1_params->bfwIqWidth*2; // total in bits parm_size = iq_size>>3; // total in bytes (/8) if(iq_size%8) parm_size++; // round up - EXPECT_TRUE(std::memcmp(ext1_result->p_bfwIQ, ext1_params->p_bfwIQ, parm_size)); - + EXPECT_FALSE(std::memcmp(ext1_result->p_bfwIQ, ext1_params->p_bfwIQ, parm_size)); } break; @@ -498,7 +740,7 @@ void C_plane::verify_sections(void) struct xran_sectionext2_info *ext2_params, *ext2_result; ext2_params = (struct xran_sectionext2_info *)m_params.sections[i].exData[j].data; - ext2_result = (struct xran_sectionext2_info *)m_result.sections[i].exData[j].data; + ext2_result = &m_result.sections[i].exts[j].u.ext2; if(ext2_params->bfAzPtWidth) { EXPECT_TRUE(ext2_result->bfAzPtWidth == ext2_params->bfAzPtWidth); @@ -523,24 +765,55 @@ void C_plane::verify_sections(void) } break; + case XRAN_CP_SECTIONEXTCMD_3: + { + struct xran_sectionext3_info *ext3_params, *ext3_result; + + ext3_params = (struct xran_sectionext3_info *)m_params.sections[i].exData[j].data; + ext3_result = &m_result.sections[i].exts[j].u.ext3; + + EXPECT_TRUE(ext3_result->layerId == ext3_params->layerId); + EXPECT_TRUE(ext3_result->codebookIdx== ext3_params->codebookIdx); + EXPECT_TRUE(ext3_result->numLayers == ext3_params->numLayers); + + if(ext3_params->layerId == XRAN_LAYERID_0 + || ext3_params->layerId == XRAN_LAYERID_TXD) { /* first data layer */ + EXPECT_TRUE(ext3_result->txScheme == ext3_params->txScheme); + EXPECT_TRUE(ext3_result->crsReMask == ext3_params->crsReMask); + EXPECT_TRUE(ext3_result->crsShift == ext3_params->crsShift); + EXPECT_TRUE(ext3_result->crsSymNum == ext3_params->crsSymNum); + + EXPECT_TRUE(ext3_result->numAntPort == ext3_params->numAntPort); + + EXPECT_TRUE(ext3_result->beamIdAP1 == ext3_params->beamIdAP1); + + if(ext3_params->numAntPort == 4) { + EXPECT_TRUE(ext3_result->beamIdAP2 == ext3_params->beamIdAP2); + EXPECT_TRUE(ext3_result->beamIdAP3 == ext3_params->beamIdAP3); + } + } + } + break; + case XRAN_CP_SECTIONEXTCMD_4: { struct xran_sectionext4_info *ext4_params, *ext4_result; ext4_params = (struct xran_sectionext4_info *)m_params.sections[i].exData[j].data; - ext4_result = (struct xran_sectionext4_info *)m_result.sections[i].exData[j].data; + ext4_result = &m_result.sections[i].exts[j].u.ext4; EXPECT_TRUE(ext4_result->csf == ext4_params->csf); EXPECT_TRUE(ext4_result->modCompScaler == ext4_params->modCompScaler); } break; + case XRAN_CP_SECTIONEXTCMD_5: { struct xran_sectionext5_info *ext5_params, *ext5_result; int idx; ext5_params = (struct xran_sectionext5_info *)m_params.sections[i].exData[j].data; - ext5_result = (struct xran_sectionext5_info *)m_result.sections[i].exData[j].data; + ext5_result = &m_result.sections[i].exts[j].u.ext5; EXPECT_TRUE(ext5_result->num_sets == ext5_params->num_sets); for(idx=0; idx < ext5_params->num_sets; idx++) { @@ -550,244 +823,303 @@ void C_plane::verify_sections(void) } } break; - } - } - } - } - - return; -} - - -/*************************************************************************** - * Functional Test cases - ***************************************************************************/ - -TEST_P(C_plane, Section_Ext1) -{ - int i = 0, idRb; - int32_t len = 0; - int16_t *ptr = NULL; - int32_t nRbs = 36; - int32_t nAntElm = 32; - int8_t iqWidth = 16; - int8_t compMethod = XRAN_COMPMETHOD_NONE; - int8_t *p_ext1_dst = NULL; - int16_t *bfw_payload = NULL; - int32_t expected_len = (3+1)*nRbs + nAntElm*nRbs*4; - - struct xran_section_gen_info* loc_pSectGenInfo = m_params.sections; - struct xran_sectionext1_info m_ext1; - struct xran_cp_radioapp_section_ext1 *p_ext1; - - /* Configure section information */ - if(prepare_sections(false) < 0) { - FAIL() << "Invalid Section configuration\n"; - } - ptr = m_p_bfw_iq_src; - - for (idRb =0; idRb < nRbs*nAntElm*2; idRb++){ - ptr[idRb] = i; - i++; - } - - len = xran_cp_populate_section_ext_1(m_p_ext1_dst, - m_ext1_dst_len, - m_p_bfw_iq_src, - nRbs, - nAntElm, - iqWidth, - compMethod); - - ASSERT_TRUE(len == expected_len); - - p_ext1_dst = m_p_ext1_dst; - idRb = 0; - do { - p_ext1 = (struct xran_cp_radioapp_section_ext1 *)p_ext1_dst; - bfw_payload = (int16_t*)(p_ext1+1); - p_ext1_dst += p_ext1->extLen*XRAN_SECTIONEXT_ALIGN; - idRb++; - }while(p_ext1->ef != XRAN_EF_F_LAST); - - ASSERT_TRUE(idRb == nRbs); - - /* Update section information */ - memset(&m_ext1, 0, sizeof (struct xran_sectionext1_info)); - m_ext1.bfwNumber = nAntElm; - m_ext1.bfwiqWidth = iqWidth; - m_ext1.bfwCompMeth = compMethod; - m_ext1.p_bfwIQ = (int16_t*)m_p_ext1_dst; - m_ext1.bfwIQ_sz = len; + case XRAN_CP_SECTIONEXTCMD_6: + { + struct xran_sectionext6_info *ext6_params, *ext6_result; - loc_pSectGenInfo->exData[0].type = XRAN_CP_SECTIONEXTCMD_1; - loc_pSectGenInfo->exData[0].len = sizeof(m_ext1); - loc_pSectGenInfo->exData[0].data = &m_ext1; + ext6_params = (struct xran_sectionext6_info *)m_params.sections[i].exData[j].data; + ext6_result = &m_result.sections[i].exts[j].u.ext6; - loc_pSectGenInfo->info.ef = 1; - loc_pSectGenInfo->exDataSize = 1; + EXPECT_TRUE(ext6_result->rbgSize == ext6_params->rbgSize); + EXPECT_TRUE(ext6_result->rbgMask == ext6_params->rbgMask); + EXPECT_TRUE(ext6_result->symbolMask == ext6_params->symbolMask); + } + break; + case XRAN_CP_SECTIONEXTCMD_9: + { + struct xran_sectionext9_info *ext9_params, *ext9_result; - m_params.numSections = 1; + ext9_params = (struct xran_sectionext9_info *)m_params.sections[i].exData[j].data; + ext9_result = &m_result.sections[i].exts[j].u.ext9; + EXPECT_TRUE(ext9_result->technology == ext9_params->technology); + } + break; + case XRAN_CP_SECTIONEXTCMD_10: + { + struct xran_sectionext10_info *ext10_params, *ext10_result; + int idx; - /* Generating C-Plane packet */ - ASSERT_TRUE(xran_prepare_ctrl_pkt(m_pTestBuffer, &m_params, m_ccId, m_antId, m_seqId) == XRAN_STATUS_SUCCESS); + ext10_params = (struct xran_sectionext10_info *)m_params.sections[i].exData[j].data; + ext10_result = &m_result.sections[i].exts[j].u.ext10; - /* Parsing generated packet */ - EXPECT_TRUE(xran_parse_cp_pkt(m_pTestBuffer, &m_result, &m_pktInfo) == XRAN_STATUS_SUCCESS); + EXPECT_TRUE(ext10_result->numPortc == ext10_params->numPortc); + EXPECT_TRUE(ext10_result->beamGrpType == ext10_params->beamGrpType); + if(ext10_result->beamGrpType == XRAN_BEAMGT_VECTORLIST) { + for(idx=0; idx < ext10_result->numPortc; idx++) + EXPECT_TRUE(ext10_result->beamID[idx] == ext10_params->beamID[idx]); + } + } + break; + case XRAN_CP_SECTIONEXTCMD_11: + { + struct xran_sectionext11_info *ext11_params; + struct xran_sectionext11_recv_info *ext11_result; + + ext11_params = (struct xran_sectionext11_info *)m_params.sections[i].exData[j].data; + ext11_result = &m_result.sections[i].exts[j].u.ext11; + + EXPECT_TRUE(ext11_result->RAD == ext11_params->RAD); + EXPECT_TRUE(ext11_result->disableBFWs == ext11_params->disableBFWs); + EXPECT_TRUE(ext11_result->numBundPrb == ext11_params->numBundPrb); + EXPECT_TRUE(ext11_result->bfwCompMeth == ext11_params->bfwCompMeth); + EXPECT_TRUE(ext11_result->bfwIqWidth == ext11_params->bfwIqWidth); + + + EXPECT_TRUE(ext11_result->numSetBFWs == ext11_params->numSetBFWs); + for(k=0; k < ext11_result->numSetBFWs; k++) { + EXPECT_TRUE(ext11_result->bundInfo[k].beamId == m_bfwInfo[k].beamId); +#if 0 + EXPECT_TRUE(ext11_result->bundInfo[k].BFWSize == ext11_params->BFWSize); + + if(ext11_result->bundInfo[k].pBFWs) + EXPECT_TRUE(memcmp(ext11_result->bundInfo[k].pBFWs, + ext11_params->bundInfo[k].pBFWs + ext11_params->bundInfo[k].offset + 4, + ext11_result->bundInfo[k].BFWSize) == 0); + switch(ext11_result->bfwCompMeth) { + case XRAN_BFWCOMPMETHOD_NONE: + break; + + case XRAN_BFWCOMPMETHOD_BLKFLOAT: + EXPECT_TRUE(ext11_result->bundInfo[k].bfwCompParam.exponent == ext11_params->bundInfo[k].bfwCompParam.exponent); + break; + + default: + FAIL() << "Invalid BfComp method - %d" << ext11_result->bfwCompMeth << std::endl; + } +#endif + } + } + break; + } + } + } + if(m_params.sections[i].info != NULL) + delete m_params.sections[i].info; + } - /* Verify the result */ - //verify_sections(); + return; } -TEST_P(C_plane, Section_Ext1_9bit) +void C_plane::test_ext1(void) { int i = 0, idRb; - int32_t len = 0; int16_t *ptr = NULL; int32_t nRbs = 36; - int32_t nAntElm = 32; + int32_t nAntElm = 64; int8_t iqWidth = 9; int8_t compMethod = XRAN_COMPMETHOD_BLKFLOAT; + int numSections = 0; int8_t *p_ext1_dst = NULL; - int16_t *bfw_payload = NULL; - int32_t expected_len = ((nAntElm/16*4*iqWidth)+1)*nRbs + /* bfwCompParam + IQ = */ - sizeof(struct xran_cp_radioapp_section_ext1)*nRbs; /* ext1 Headers */ + int8_t *bfw_payload = NULL; + // int32_t expected_len = ((nAntElm/16*4*iqWidth)+1)*nRbs + /* bfwCompParam + IQ = */ + // sizeof(struct xran_cp_radioapp_section_ext1)*nRbs; /* ext1 Headers */ + + int16_t ext_len = 9600; + int16_t ext_sec_total = 0; + int8_t * ext_buf = nullptr; + int8_t * ext_buf_init = nullptr; struct xran_section_gen_info* loc_pSectGenInfo = m_params.sections; - struct xran_sectionext1_info m_ext1; + struct xran_sectionext1_info m_prep_ext1; struct xran_cp_radioapp_section_ext1 *p_ext1; + struct xran_cp_radioapp_section1 *p_section1; + struct rte_mbuf_ext_shared_info share_data; + struct rte_mbuf *mbuf = NULL; + struct xran_sectionext1_info ext1; + + + nAntElm = m_antElmTRx; + nRbs = m_params.sections[0].info->numPrbc; + iqWidth = m_extcfgs[0].u.ext1.bfwIqWidth; + compMethod = m_extcfgs[0].u.ext1.bfwCompMeth; + numSections = m_numSections; + +#if 0 + switch(compMethod) { + case XRAN_BFWCOMPMETHOD_NONE: + // expected_len = (3+1)*nRbs + nAntElm*nRbs*4; + expected_len = sizeof(struct xran_cp_radioapp_section1)*numSections + \ + sizeof(struct xran_cp_radioapp_section_ext1)*numSections + \ + nAntElm*numSections*4; + break; + case XRAN_BFWCOMPMETHOD_BLKFLOAT: + expected_len = ((nAntElm/16*iqWidth)+1)*numSections*4 + /* bfwCompParam + IQ = */ + sizeof(struct xran_cp_radioapp_section1)*numSections + \ + sizeof(struct xran_cp_radioapp_section_ext1)*numSections; /* ext1 Headers */ + break; + default: + FAIL() << "Unsupported Compression Method - " << compMethod << std::endl; + } +#endif - /* Configure section information */ - if(prepare_sections(false) < 0) { - FAIL() << "Invalid Section configuration\n"; - } - ptr = m_p_bfw_iq_src; - - for (idRb =0; idRb < nRbs*nAntElm*2; idRb++){ - ptr[idRb] = i; - i++; - } - - len = xran_cp_populate_section_ext_1(m_p_ext1_dst, - m_ext1_dst_len, - m_p_bfw_iq_src, - nRbs, - nAntElm, - iqWidth, - compMethod); + if(loc_pSectGenInfo->info->type == XRAN_CP_SECTIONTYPE_1) { + ext_buf = ext_buf_init = (int8_t*) xran_malloc(ext_len); + if (ext_buf) { + ptr = m_p_bfw_iq_src; - ASSERT_TRUE(len == expected_len); + for (idRb =0; idRb < nRbs*nAntElm*2; idRb++){ + ptr[idRb] = i; + i++; + } - p_ext1_dst = m_p_ext1_dst; - idRb = 0; - do { - p_ext1 = (struct xran_cp_radioapp_section_ext1 *)p_ext1_dst; - bfw_payload = (int16_t*)(p_ext1+1); - p_ext1_dst += p_ext1->extLen*XRAN_SECTIONEXT_ALIGN; - idRb++; - }while(p_ext1->ef != XRAN_EF_F_LAST); + ext_buf += (RTE_PKTMBUF_HEADROOM + + sizeof (struct xran_ecpri_hdr) + + sizeof(struct xran_cp_radioapp_common_header)); - ASSERT_TRUE(idRb == nRbs); + ext_len -= (RTE_PKTMBUF_HEADROOM + + sizeof(struct xran_ecpri_hdr) + + sizeof(struct xran_cp_radioapp_common_header)); - /* Update section information */ - memset(&m_ext1, 0, sizeof (struct xran_sectionext1_info)); - m_ext1.bfwNumber = nAntElm; - m_ext1.bfwiqWidth = iqWidth; - m_ext1.bfwCompMeth = compMethod; - m_ext1.p_bfwIQ = (int16_t*)m_p_ext1_dst; - m_ext1.bfwIQ_sz = len; + m_prb_ele = (xran_prb_elm *) xran_malloc(sizeof(struct xran_prb_elm)); - loc_pSectGenInfo->exData[0].type = XRAN_CP_SECTIONEXTCMD_1; - loc_pSectGenInfo->exData[0].len = sizeof(m_ext1); - loc_pSectGenInfo->exData[0].data = &m_ext1; + m_prb_ele->bf_weight.bfwIqWidth = iqWidth; + m_prb_ele->bf_weight.bfwCompMeth = compMethod; + m_prb_ele->bf_weight.numSetBFWs = numSections; + m_prb_ele->bf_weight.nAntElmTRx = nAntElm; + ext_sec_total = xran_cp_populate_section_ext_1((int8_t *)ext_buf, + ext_len, + m_p_bfw_iq_src, + m_prb_ele); - loc_pSectGenInfo->info.ef = 1; - loc_pSectGenInfo->exDataSize = 1; + // ASSERT_TRUE(ext_sec_total == expected_len); + p_ext1_dst = ext_buf; - m_params.numSections = 1; + memset(&m_temp_ext1[0], 0, sizeof (struct xran_sectionext1_info)*XRAN_MAX_PRBS); - /* Generating C-Plane packet */ - ASSERT_TRUE(xran_prepare_ctrl_pkt(m_pTestBuffer, &m_params, m_ccId, m_antId, m_seqId) == XRAN_STATUS_SUCCESS); + idRb = 0; + do { + p_section1 = (struct xran_cp_radioapp_section1 *)p_ext1_dst; + p_ext1 = (struct xran_cp_radioapp_section_ext1 *)(p_section1+1); + bfw_payload = (int8_t*)(p_ext1+1); + m_pSectGenInfo[idRb].info->id = idRb; - /* Parsing generated packet */ - EXPECT_TRUE(xran_parse_cp_pkt(m_pTestBuffer, &m_result, &m_pktInfo) == XRAN_STATUS_SUCCESS); + m_pSectGenInfo[idRb].exData[0].type = XRAN_CP_SECTIONEXTCMD_1; + m_pSectGenInfo[idRb].exData[0].len = sizeof(ext1); - /* Verify the result */ - //verify_sections(); -} + m_pSectGenInfo[idRb].info->ef = 1; + m_pSectGenInfo[idRb].exDataSize = 1; + p_ext1_dst += sizeof(struct xran_cp_radioapp_section1) /*+ sizeof(struct xran_cp_radioapp_section_ext1)*/ + p_ext1->extLen*XRAN_SECTIONEXT_ALIGN; -TEST_P(C_plane, PacketGen) -{ - int i; + m_temp_ext1[0].bfwNumber = nAntElm; + m_temp_ext1[0].bfwIqWidth = iqWidth; + m_temp_ext1[0].bfwCompMeth = compMethod; + m_temp_ext1[0].p_bfwIQ = (int8_t*)bfw_payload; + m_temp_ext1[0].bfwIQ_sz = p_ext1->extLen*XRAN_SECTIONEXT_ALIGN; + if(compMethod == XRAN_BFWCOMPMETHOD_BLKFLOAT) { + m_temp_ext1[0].bfwCompParam.exponent = *bfw_payload++ & 0xF; + } + m_pSectGenInfo[idRb].exData[0].data = &m_temp_ext1[0]; + idRb++; + } while(idRb < numSections); /*p_ext1->ef != XRAN_EF_F_LAST);*/ + ASSERT_TRUE(idRb == numSections); - /* Configure section information */ - if(prepare_sections(false) < 0) { - FAIL() << "Invalid Section configuration\n"; - } + mbuf = xran_attach_cp_ext_buf(0, ext_buf_init, ext_buf, ext_sec_total, &share_data); + m_params.numSections = numSections; - /* Generating C-Plane packet */ - ASSERT_TRUE(xran_prepare_ctrl_pkt(m_pTestBuffer, &m_params, m_ccId, m_antId, m_seqId) == XRAN_STATUS_SUCCESS); + /* Generating C-Plane packet */ + ASSERT_TRUE(xran_prepare_ctrl_pkt(/*m_pTestBuffer*/mbuf, &m_params, m_ccId, m_antId, m_seqId, 0) == XRAN_STATUS_SUCCESS); + EXPECT_TRUE(xran_parse_cp_pkt(/*m_pTestBuffer*/mbuf, &m_result, &m_pktInfo, (void *)&m_xran_dev_ctx, &mb_free) == XRAN_STATUS_SUCCESS); + } + else { + FAIL() << "xran_malloc failed\n"; + } - /* Parsing generated packet */ - EXPECT_TRUE(xran_parse_cp_pkt(m_pTestBuffer, &m_result, &m_pktInfo) == XRAN_STATUS_SUCCESS); + /* Verify the result */ + verify_sections(); - /* Verify the result */ - verify_sections(); + if(ext_buf_init) + xran_free(ext_buf_init); + } } +/*************************************************************************** + * Functional Test cases + ***************************************************************************/ -TEST_P(C_plane, PacketGen_Ext) +TEST_P(C_plane, CPacketGen) { - int i; - - /* Configure section information */ - if(prepare_sections(true) < 0) { + if(prepare_sections() < 0) { FAIL() << "Invalid Section configuration\n"; + } + if(prepare_extensions() < 0) { + FAIL() << "Invalid Section extension configuration\n"; + } + if(m_nextcfgs) { + if(m_extcfgs[0].type == XRAN_CP_SECTIONEXTCMD_1) { + test_ext1(); + return; } + else if(m_extcfgs[0].type == XRAN_CP_SECTIONEXTCMD_11) { + /* use large buffer to linearize external buffer for parsing */ + m_pTestBuffer = xran_ethdi_mbuf_alloc(); + ASSERT_FALSE(m_pTestBuffer == nullptr); + + if(xran_cp_attach_ext_buf(m_pTestBuffer, + m_pBfwIQ_ext, + m_extcfgs[0].u.ext11.maxExtBufSize, + &m_extSharedInfo) < 0) { + rte_pktmbuf_free(m_pTestBuffer); + m_pTestBuffer = nullptr; + FAIL() << "Failed to attach external buffer !!\n"; + } + rte_mbuf_ext_refcnt_update(&m_extSharedInfo, 0); + } + } + if(m_pTestBuffer == nullptr) { + m_pTestBuffer = xran_ethdi_mbuf_alloc(); + ASSERT_FALSE(m_pTestBuffer == nullptr); + } + + xran_cp_init_sectiondb((void *)&m_xran_dev_ctx); /* Generating C-Plane packet */ - ASSERT_TRUE(xran_prepare_ctrl_pkt(m_pTestBuffer, &m_params, m_ccId, m_antId, m_seqId) == XRAN_STATUS_SUCCESS); + ASSERT_TRUE(xran_prepare_ctrl_pkt(m_pTestBuffer, &m_params, m_ccId, m_antId, m_seqId, 0) == XRAN_STATUS_SUCCESS); + /* Linearize data in the chain of mbufs to parse generated packet*/ + ASSERT_TRUE(rte_pktmbuf_linearize(m_pTestBuffer) == 0); /* Parsing generated packet */ - EXPECT_TRUE(xran_parse_cp_pkt(m_pTestBuffer, &m_result, &m_pktInfo) == XRAN_STATUS_SUCCESS); + EXPECT_TRUE(xran_parse_cp_pkt(m_pTestBuffer, &m_result, &m_pktInfo, (void *)&m_xran_dev_ctx, &mb_free) == XRAN_STATUS_SUCCESS); /* Verify the result */ verify_sections(); } - /*************************************************************************** * Performance Test cases ***************************************************************************/ + TEST_P(C_plane, Perf) { /* Configure section information */ - if(prepare_sections(false) < 0) { + if(prepare_sections() < 0) { FAIL() << "Invalid Section configuration\n"; } - - /* using wrapper function to reset mbuf */ - performance("C", module_name, - &xran_ut_prepare_cp, m_pTestBuffer, &m_params, m_ccId, m_antId, m_seqId); -} - -TEST_P(C_plane, Perf_Ext) -{ - /* Configure section information */ - if(prepare_sections(true) < 0) { - FAIL() << "Invalid Section configuration\n"; + if(prepare_extensions() < 0) { + FAIL() << "Invalid Section extension configuration\n"; } + xran_cp_init_sectiondb((void *)&m_xran_dev_ctx); /* using wrapper function to reset mbuf */ performance("C", module_name, - &xran_ut_prepare_cp, m_pTestBuffer, &m_params, m_ccId, m_antId, m_seqId); + &xran_ut_prepare_cp, &m_params, m_ccId, m_antId, m_seqId, 0); } + INSTANTIATE_TEST_CASE_P(UnitTest, C_plane, testing::ValuesIn(get_sequence(C_plane::get_number_of_cases("C_Plane"))));