Commit e26bbf72 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into basop-ci/improve-histograms

parents d8f12952 954dbe70

tests/codec_be_on_mr_nonselection/test_param_file.py

+13 −6
Original line number Diff line number Diff line
@@ -43,7 +43,12 @@ import numpy as np 


from tests.cmp_pcm import cmp_pcm

from tests.cmp_stats_files import cmp_stats_files

from tests.conftest import DecoderFrontend, EncoderFrontend, parse_properties

from tests.conftest import (

    DecoderFrontend,

    EncoderFrontend,

    parse_properties,

    log_dbg_msg,

)

from tests.testconfig import PARAM_FILE

from tests.constants import (

    MAX_ENC_FILE_LENGTH_DIFF,
@@ -206,7 +211,6 @@ def test_param_file_tests( 
    get_odg,

    compare_to_input,

):



    enc_opts, dec_opts, sim_opts, eid_opts = param_file_test_dict[test_tag]



    run_test(
@@ -267,7 +271,6 @@ def run_test( 
    get_odg,

    compare_to_input,

):



    # If compare_to_input is set, only run pass-through test cases

    if compare_to_input:

        passthrough = [
@@ -489,7 +492,6 @@ def run_test( 
    )



    if update_ref in [0, 2]:



        # Output file names for comparison

        dut_output_file = f"{dut_base_path}/param_file/dec/{output_file}"

        ref_output_file = f"{reference_path}/param_file/dec/{output_file}"
@@ -499,7 +501,6 @@ def run_test( 
        odg_test = None

        odg_ref = None

        if get_odg:



            # Find input format

            in_fmt = [(a, b) for (a, b) in INPUT_FMT if re.search(a, enc_opts)][0][1]
@@ -763,7 +764,10 @@ def simulate( 
        cmd_opts[3] = f"{dut_out_dir}/{netsim_tracefile}"

        cmd_opts[2] = f"{dut_out_dir}/{netsim_outfile}"  # dut_out_file



    run(netsim + cmd_opts, check=False)

    netsim_cmd = netsim + cmd_opts

    netsim_cmd_str = " ".join(netsim_cmd)

    log_dbg_msg(f"netsim command:\n{netsim_cmd_str}")

    run(netsim_cmd, check=False)





def error_insertion(
@@ -813,6 +817,9 @@ def error_insertion( 
    elif update_ref in [0, 2]:

        cmd_opts[-1] = f"{dut_out_dir}/{eid_xor_outfile}"  # ref_out_file



    eid_cmd = eid_xor + cmd_opts

    eid_cmd_str = " ".join(eid_cmd)

    log_dbg_msg(f"eid-xor command:\n{eid_cmd_str}")

    run(eid_xor + cmd_opts, check=False)

tests/conftest.py

+5 −4
Original line number Diff line number Diff line
@@ -387,11 +387,13 @@ def dut_encoder_path(request) -> str: 


    return path





# fixture returns test information, enabling per-testcase SNR

@pytest.fixture

def test_info(request):

    return request





class EncoderFrontend:

    def __init__(self, path, enc_type, record_property, timeout=None) -> None:

        self._path = Path(path).absolute()
@@ -1052,7 +1054,6 @@ def compare_to_input(request) -> bool: 
    return request.config.getoption("--compare_to_input")







def pytest_configure(config):

    config.addinivalue_line("markers", "serial: mark test to run only in serial")

    if config.option.param_file: