fix(testgen): route cp_csr_frm through formatter pipeline

Author: dev-aditya-hub

generators/testgen/src/testgen/coverpoints/cp_csr_frm.py

@@ -21,15 +21,16 @@ def make_frm(instr_name: str, instr_type: str, coverpoint: str, test_data: TestD
     if coverpoint != "cp_csr_frm":
         raise ValueError(f"Unknown cp_csr_frm coverpoint variant: {coverpoint} for {instr_name}")
 
-    # csr frm modes 0-4, end at 0 so the rest of the test continues in rne
-    frm_modes = (("rmm", 4), ("rup", 3), ("rdn", 2), ("rtz", 1), ("rne", 0))
+    # Test each valid fcsr.frm value (0-4) via the dynamic rounding mode path (rm=111).
+    # Passing frm="dyn" encodes rm=111 in the instruction; csr_frm_val tells the formatter
+    # which exact value to write into fcsr.frm before the instruction executes, and the
+    # formatter restores fcsr.frm=0 in check — no ordering dependency needed.
+    frm_modes = (("rne", 0), ("rtz", 1), ("rdn", 2), ("rup", 3), ("rmm", 4))
     test_chunks: list[TestChunk] = []
-    for frm_name, frm_mode in frm_modes:
-        asm_setup = f"fsrmi 0x{frm_mode:x} # set fcsr.frm to mode {frm_mode}"
-        params = generate_random_params(test_data, instr_type, exclude_regs=[0])
-        desc = f"{coverpoint} (Test dynamic frm, fcsr.frm = {frm_mode})"
-        tc = format_single_testcase(instr_name, instr_type, test_data, params, desc, f"{frm_name}", coverpoint)
-        tc.code = asm_setup + "\n" + tc.code
+    for frm_name, frm_val in frm_modes:
+        params = generate_random_params(test_data, instr_type, exclude_regs=[0], frm="dyn", csr_frm_val=frm_val)
+        desc = f"{coverpoint} (Test dynamic frm, fcsr.frm = {frm_val})"
+        tc = format_single_testcase(instr_name, instr_type, test_data, params, desc, frm_name, coverpoint)
         test_chunks.append(tc)
         return_test_regs(test_data, params)
 

generators/testgen/src/testgen/data/params.py

@@ -61,6 +61,7 @@ class InstructionParams:
 
     # Flags
     frm: str | None = None  # Floating-point rounding mode tests
+    csr_frm_val: int | None = None  # Explicit fcsr.frm value for dyn tests; None means random non-RNE
     aqrl: str | None = None  # Acquire/Release for atomic operations
     fflags: int | None = None  # Floating-point result flags
 

generators/testgen/src/testgen/formatters/types/f2x_type.py

@@ -41,7 +41,7 @@ def format_f2x_type(
         write_sigupd(None, test_data, "fflags"),
     ]
     if params.frm == "dyn":
-        rand_frm = random.choice([1, 2, 3, 4])
-        setup.append(f"fsrmi {rand_frm}")
+        fcsr_frm = params.csr_frm_val if params.csr_frm_val is not None else random.choice([1, 2, 3, 4])
+        setup.append(f"fsrmi {fcsr_frm}")
         check.append("fsrmi 0x0")
     return (setup, test, check)

generators/testgen/src/testgen/formatters/types/fi_type.py

@@ -32,7 +32,7 @@ def format_fi_type(
     ]
     check = [write_sigupd(params.fd, test_data, "float")]
     if params.frm == "dyn":
-        rand_frm = random.choice([1, 2, 3, 4])
-        setup.append(f"fsrmi {rand_frm}")
+        fcsr_frm = params.csr_frm_val if params.csr_frm_val is not None else random.choice([1, 2, 3, 4])
+        setup.append(f"fsrmi {fcsr_frm}")
         check.append("fsrmi 0x0")
     return (setup, test, check)

generators/testgen/src/testgen/formatters/types/fr4_type.py

@@ -36,7 +36,7 @@ def format_fr4_type(
     ]
     check = [write_sigupd(params.fd, test_data, "float")]
     if params.frm == "dyn":
-        rand_frm = random.choice([1, 2, 3, 4])
-        setup.append(f"fsrmi {rand_frm}")
+        fcsr_frm = params.csr_frm_val if params.csr_frm_val is not None else random.choice([1, 2, 3, 4])
+        setup.append(f"fsrmi {fcsr_frm}")
         check.append("fsrmi 0x0")
     return (setup, test, check)

generators/testgen/src/testgen/formatters/types/fr_type.py

@@ -34,7 +34,7 @@ def format_fr_type(
     ]
     check = [write_sigupd(params.fd, test_data, "float")]
     if params.frm == "dyn":
-        rand_frm = random.choice([1, 2, 3, 4])
-        setup.append(f"fsrmi {rand_frm}")
+        fcsr_frm = params.csr_frm_val if params.csr_frm_val is not None else random.choice([1, 2, 3, 4])
+        setup.append(f"fsrmi {fcsr_frm}")
         check.append("fsrmi 0x0")
     return (setup, test, check)

generators/testgen/src/testgen/formatters/types/x2f_type.py

@@ -32,7 +32,7 @@ def format_x2f_type(
     ]
     check = [write_sigupd(params.fd, test_data, "float")]
     if params.frm == "dyn":
-        rand_frm = random.choice([1, 2, 3, 4])
-        setup.append(f"fsrmi {rand_frm}")
+        fcsr_frm = params.csr_frm_val if params.csr_frm_val is not None else random.choice([1, 2, 3, 4])
+        setup.append(f"fsrmi {fcsr_frm}")
         check.append("fsrmi 0x0")
     return (setup, test, check)