fix(testgen): add _frm support to cp_fs2_edges and cp_fs3_edges

Author: dev-aditya-hub

generators/testgen/src/testgen/coverpoints/cp_fp_reg_edges.py

@@ -16,76 +16,60 @@
 from testgen.formatters.params import generate_random_params
 
 
-@add_coverpoint_generator("cp_fs1_edges")
-def make_fs1_edges(instr_name: str, instr_type: str, coverpoint: str, test_data: TestData) -> list[TestChunk]:
-    """Generate tests for fs1 edge values."""
+def _select_edges(coverpoint: str) -> tuple:
     if coverpoint.endswith("_D"):
-        edges = FLOAT_EDGES.double
+        return FLOAT_EDGES.double
     elif coverpoint.endswith("_H"):
-        edges = FLOAT_EDGES.half
+        return FLOAT_EDGES.half
     elif coverpoint.endswith("_BF16"):
-        edges = FLOAT_EDGES.bf16
-    else:
-        edges = FLOAT_EDGES.single
+        return FLOAT_EDGES.bf16
+    return FLOAT_EDGES.single
+
 
-    cross_frm = "_frm" in coverpoint
+def _frm_modes(coverpoint: str) -> tuple:
+    return ("dyn", "rdn", "rmm", "rne", "rtz", "rup") if "_frm" in coverpoint else (None,)
 
-    frm_modes = ("dyn", "rdn", "rmm", "rne", "rtz", "rup") if cross_frm else [None]
 
+@add_coverpoint_generator("cp_fs1_edges")
+def make_fs1_edges(instr_name: str, instr_type: str, coverpoint: str, test_data: TestData) -> list[TestChunk]:
+    """Generate tests for fs1 edge values."""
     test_chunks: list[TestChunk] = []
-    for edge_val in edges:
-        for frm_mode in frm_modes:
+    for edge_val in _select_edges(coverpoint):
+        for frm_mode in _frm_modes(coverpoint):
             params = generate_random_params(test_data, instr_type, exclude_regs=[0], fs1val=edge_val, frm=frm_mode)
             bin_name = f"b{edge_val:#x}{f'_{frm_mode}' if frm_mode is not None else ''}"
             desc = f"{coverpoint} (Test source fs1 value = {test_data.flen_format_str.format(edge_val)}{f', frm = {frm_mode}' if frm_mode is not None else ''})"
             tc = format_single_testcase(instr_name, instr_type, test_data, params, desc, bin_name, coverpoint)
             test_chunks.append(tc)
             return_test_regs(test_data, params)
-
     return test_chunks
 
 
 @add_coverpoint_generator("cp_fs2_edges")
 def make_fs2_edges(instr_name: str, instr_type: str, coverpoint: str, test_data: TestData) -> list[TestChunk]:
     """Generate tests for fs2 edge values."""
-    if coverpoint.endswith("_D"):
-        edges = FLOAT_EDGES.double
-    elif coverpoint.endswith("_H"):
-        edges = FLOAT_EDGES.half
-    elif coverpoint.endswith("_BF16"):
-        edges = FLOAT_EDGES.bf16
-    else:
-        edges = FLOAT_EDGES.single
-
     test_chunks: list[TestChunk] = []
-    for edge_val in edges:
-        params = generate_random_params(test_data, instr_type, exclude_regs=[0], fs2val=edge_val)
-        desc = f"{coverpoint} (Test source fs2 value = {test_data.flen_format_str.format(edge_val)})"
-        tc = format_single_testcase(instr_name, instr_type, test_data, params, desc, f"b{edge_val:#x}", coverpoint)
-        test_chunks.append(tc)
-        return_test_regs(test_data, params)
-
+    for edge_val in _select_edges(coverpoint):
+        for frm_mode in _frm_modes(coverpoint):
+            params = generate_random_params(test_data, instr_type, exclude_regs=[0], fs2val=edge_val, frm=frm_mode)
+            bin_name = f"b{edge_val:#x}{f'_{frm_mode}' if frm_mode is not None else ''}"
+            desc = f"{coverpoint} (Test source fs2 value = {test_data.flen_format_str.format(edge_val)}{f', frm = {frm_mode}' if frm_mode is not None else ''})"
+            tc = format_single_testcase(instr_name, instr_type, test_data, params, desc, bin_name, coverpoint)
+            test_chunks.append(tc)
+            return_test_regs(test_data, params)
     return test_chunks
 
 
 @add_coverpoint_generator("cp_fs3_edges")
 def make_fs3_edges(instr_name: str, instr_type: str, coverpoint: str, test_data: TestData) -> list[TestChunk]:
     """Generate tests for fs3 edge values."""
-    if coverpoint.endswith("_D"):
-        edges = FLOAT_EDGES.double
-    elif coverpoint.endswith("_H"):
-        edges = FLOAT_EDGES.half
-    elif coverpoint.endswith("_BF16"):
-        edges = FLOAT_EDGES.bf16
-    else:
-        edges = FLOAT_EDGES.single
-
     test_chunks: list[TestChunk] = []
-    for edge_val in edges:
-        params = generate_random_params(test_data, instr_type, exclude_regs=[0], fs3val=edge_val)
-        desc = f"{coverpoint} (Test source fs3 value = {test_data.flen_format_str.format(edge_val)})"
-        tc = format_single_testcase(instr_name, instr_type, test_data, params, desc, f"b{edge_val:#x}", coverpoint)
-        test_chunks.append(tc)
-        return_test_regs(test_data, params)
-
+    for edge_val in _select_edges(coverpoint):
+        for frm_mode in _frm_modes(coverpoint):
+            params = generate_random_params(test_data, instr_type, exclude_regs=[0], fs3val=edge_val, frm=frm_mode)
+            bin_name = f"b{edge_val:#x}{f'_{frm_mode}' if frm_mode is not None else ''}"
+            desc = f"{coverpoint} (Test source fs3 value = {test_data.flen_format_str.format(edge_val)}{f', frm = {frm_mode}' if frm_mode is not None else ''})"
+            tc = format_single_testcase(instr_name, instr_type, test_data, params, desc, bin_name, coverpoint)
+            test_chunks.append(tc)
+            return_test_regs(test_data, params)
     return test_chunks