Fix items related to testing of TestFloat that were not always matching. The issue resulted due to the repeat statement that interferes with the always block. I separated the two to allow them to work correctly

testbench/testbench-fp.sv

@@ -75,11 +75,13 @@ module testbenchfp;
    logic [P.CVTLEN-1:0] 		CvtLzcInE;                  // input to the Leading Zero Counter (priority encoder)
    logic                        IntZero;
    logic                        CvtResSgnE;
-   logic [P.NE:0] 		CvtCalcExpE;                // the calculated expoent
+   logic [P.NE:0] 		CvtCalcExpE;                // the calculated exponent
    logic [P.LOGCVTLEN-1:0] 	CvtShiftAmtE;               // how much to shift by
    logic [P.DIVb:0] 		Quot;
    logic                        CvtResSubnormUfE;
-   logic                        DivStart, FDivBusyE, OldFDivBusyE;
+   logic                        DivStart;
+   logic 			FDivBusyE;
+   logic 			OldFDivBusyE;
    logic                        reset = 1'b0;
    logic [$clog2(P.NF+2)-1:0] 	XZeroCnt, YZeroCnt;
    logic [P.DURLEN-1:0] 	Dur;
@@ -107,10 +109,14 @@ module testbenchfp;
    logic [2:0] 			Funct3E;
    logic [2:0] 			Funct3M;
    logic 			FlushE;
-   logic 			IFDivStartE, FDivDoneE;
+   logic 			IFDivStartE;
+   logic 			FDivDoneE;
    logic [P.NE+1:0] 		QeM;
    logic [P.DIVb:0] 		QmM;
    logic [P.XLEN-1:0] 		FIntDivResultM;
+   logic 			ResMatch;                   // Check if result matches
+   logic 			FlagMatch;                  // Check if flag matches
+   logic 			CheckNow;                   // Final check
 
    ///////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -805,6 +811,7 @@ module testbenchfp;
 	 endcase
       end
    end 
+   
    always_comb begin
       // select the result to check
       case (UnitVal)
@@ -825,11 +832,22 @@ module testbenchfp;
       endcase
    end
 
-   logic ResMatch, FlagMatch, CheckNow;
-
    always @(posedge clk) 
      OldFDivBusyE = FDivDoneE;
 
+   // For FP division this adds extra clock cycles to make sure the
+   // computation completes.  18 clocks cycles are utilize to handle
+   // Quad, but this can be changed for each precision to go faster.
+   always @(posedge clk) begin
+      // Add extra clock cycles in beginning for fdivsqrt to adequate reset state
+      if(~(FDivBusyE|DivStart)|(UnitVal != `DIVUNIT)) begin
+	 repeat (18)
+	   @(posedge clk);
+	 if (reset != 1'b1)
+	   VectorNum += 1; // increment the vector
+      end
+   end
+
    // check results on falling edge of clk
    always @(negedge clk) begin
 
@@ -896,15 +914,14 @@ module testbenchfp;
       ///////////////////////////////////////////////////////////////////////////////////////////////
 
       // check if result is correct
-      //  - wait till the division result is done or one extra cylcle for early termination (to simulate the EM pipline stage)
+      //  wait till the division result is done or one extra cylcle for early termination (to simulate the EM pipline stage)
-      ResMatch = (Res === Ans | NaNGood | NaNGood === 1'bx);
+      assign ResMatch = ((Res === Ans) | NaNGood | (NaNGood === 1'bx));
-      FlagMatch = (ResFlg === AnsFlg | AnsFlg === 5'bx);
+      assign FlagMatch = ((ResFlg === AnsFlg) | (AnsFlg === 5'bx));
-      divsqrtop = OpCtrlVal == `SQRT_OPCTRL | OpCtrlVal == `DIV_OPCTRL;
+      assign divsqrtop = (OpCtrlVal == `SQRT_OPCTRL) | (OpCtrlVal == `DIV_OPCTRL);
       assign DivDone = OldFDivBusyE & ~FDivBusyE;
 
-      //assign divsqrtop = OpCtrl[TestNum] == `SQRT_OPCTRL | OpCtrl[TestNum] == `DIV_OPCTRL;
+      assign CheckNow = (DivDone | ~divsqrtop) & (UnitVal !== `CVTINTUNIT) & (UnitVal !== `CMPUNIT);
-      CheckNow = (DivDone | ~divsqrtop) & (UnitVal !== `CVTINTUNIT)&(UnitVal !== `CMPUNIT);
+      if (~(ResMatch & FlagMatch) & CheckNow) begin
-      if(~(ResMatch & FlagMatch) & CheckNow) begin
 	 errors += 1;
 	 $display("TestNum %d OpCtrl %d", TestNum, OpCtrl[TestNum]);
 	 $display("Error in %s", Tests[TestNum]);
@@ -928,14 +945,6 @@ module testbenchfp;
 	 $stop;
       end
 
-      // Add extra clock cycles in beginning for fdivsqrt to adequate reset state
-      if(~(FDivBusyE|DivStart)|(UnitVal != `DIVUNIT)) begin
-	 repeat (12)
-	   @(posedge clk);
-	 if (reset != 1'b1)
-	   VectorNum += 1; // increment the vector
-      end
-      
       if (TestVectors[VectorNum][0] === 1'bx & Tests[TestNum] !== "") begin // if reached the eof
 	 // increment the test
 	 TestNum += 1;
@@ -994,11 +1003,13 @@ module readvectors (
    logic 					XEn, YEn, ZEn;
    logic 					FPUActive;   
 
-
    // apply test vectors on rising edge of clk
    // Format of vectors Inputs(1/2/3)_AnsFlg
    always @(VectorNum) begin
-      #1;
+      // Initial delay is given to allow vector to work for fdiv
+      // otherwise it will fail on first vector - fix needed (jes)
+      DivStart = 1'b0;      
+      #20;
       AnsFlg = TestVector[4:0];
       DivStart = 1'b0;
       case (Unit)