Cleanup

1 files changed, 28 insertions, 31 deletions

diff --git a/techlibs/common/cmp2lcu.v b/techlibs/common/cmp2lcu.v
index 60e03bde2..d427a4cd3 100644
--- a/techlibs/common/cmp2lcu.v
+++ b/techlibs/common/cmp2lcu.v
@@ -17,10 +17,9 @@ input [B_WIDTH-1:0] B;
 output [Y_WIDTH-1:0] Y;
 
 parameter _TECHMAP_CELLTYPE_ = "";
-localparam cmp_width = `LUT_WIDTH/2;
 
 generate
-    if (_TECHMAP_CELLTYPE_ == "" || (A_WIDTH <= cmp_width || B_WIDTH <= cmp_width))
+    if (_TECHMAP_CELLTYPE_ == "")
         wire _TECHMAP_FAIL_ = 1;
     else if (_TECHMAP_CELLTYPE_ == "$lt") begin
         // Transform $lt into $gt by swapping A and B
@@ -30,45 +29,43 @@ generate
         // Transform $le into $ge by swapping A and B
         $ge #(.A_SIGNED(B_SIGNED), .B_SIGNED(A_SIGNED), .A_WIDTH(B_WIDTH), .B_WIDTH(A_WIDTH), .Y_WIDTH(Y_WIDTH)) _TECHMAP_REPLACE_ (.A(B), .B(A), .Y(Y));
     end
-    else begin
+    else if (A_WIDTH != B_WIDTH) begin
         // Perform sign extension on A and B
         localparam WIDTH = A_WIDTH > B_WIDTH ? A_WIDTH : B_WIDTH;
         wire [WIDTH-1:0] AA = {{(WIDTH-A_WIDTH){A_SIGNED ? A[A_WIDTH-1] : 1'b0}}, A};
         wire [WIDTH-1:0] BB = {{(WIDTH-B_WIDTH){B_SIGNED ? B[B_WIDTH-1] : 1'b0}}, B};
-
-        // Compute width of $lcu/carry-chain cell
-        localparam lcu_width = (WIDTH+cmp_width-1)/cmp_width;
+        if (_TECHMAP_CELLTYPE_ == "$gt")
+            $gt #(.A_SIGNED(A_SIGNED), .B_SIGNED(B_SIGNED), .A_WIDTH(WIDTH), .B_WIDTH(WIDTH), .Y_WIDTH(Y_WIDTH)) _TECHMAP_REPLACE_ (.A(AA), .B(BB), .Y(Y));
+        else if (_TECHMAP_CELLTYPE_ == "$ge")
+            $ge #(.A_SIGNED(A_SIGNED), .B_SIGNED(B_SIGNED), .A_WIDTH(WIDTH), .B_WIDTH(WIDTH), .Y_WIDTH(Y_WIDTH)) _TECHMAP_REPLACE_ (.A(AA), .B(BB), .Y(Y));
+        else
+            wire _TECHMAP_FAIL_ = 1;
+    end
+    else begin
+        localparam cmp_width = `LUT_WIDTH/2;
+        localparam lcu_width = (A_WIDTH+cmp_width-1)/cmp_width;
         wire [lcu_width-1:0] P, G, CO;
         genvar i, j;
-        integer j;
-        for (i = 0; i < WIDTH; i=i+cmp_width) begin
+        for (i = 0; i < A_WIDTH; i=i+cmp_width) begin
             wire [cmp_width-1:0] PP, GG;
-            if (i < WIDTH-cmp_width) begin
+            for (j = cmp_width-1; j >= 0 && i+j < A_WIDTH; j = j-1) begin
                 // Bit-wise equality (xnor) of sign-extended A and B
-                assign PP = AA[i +: cmp_width] ^~ BB[i +: cmp_width];
-                // Priority "encoder" that checks A[i] == 1'b1 && B[i] == 1'b0
-                //   from MSB down, deferring to less significant bits if the
-                //   MSBs are equal
-                assign GG[cmp_width-1] = AA[i+cmp_width-1] & ~BB[i+cmp_width-1];
-                for (j = cmp_width-2; j >= 0; j=j-1)
-                    assign GG[j] = &PP[cmp_width-1:j+1] & (AA[i+j] & ~BB[i+j]);
-                // Propagate only if all bits are equal
-                //   (inconclusive evidence to say A >= B)
-                assign P[i/cmp_width] = &PP;
-                // Generate if any pairs call for it
-                assign G[i/cmp_width] = |GG;
-            end
-            else begin
-                assign PP = AA[WIDTH-1:i] ^~ BB[WIDTH-1:i];
-                if (A_SIGNED && B_SIGNED)
-                    assign GG[WIDTH-i-1] = ~AA[WIDTH-1] & BB[WIDTH-1];
+                assign PP[j] = A[i+j] ^~ B[i+j];
+                if (i+j == A_WIDTH-1 && A_SIGNED && B_SIGNED)
+                    assign GG[j] = ~A[i+j] & B[i+j];
+                else if (j == cmp_width-1)
+                    assign GG[j] = A[i+j] & ~B[i+j];
                 else
-                    assign GG[WIDTH-i-1] = AA[WIDTH-1] & ~BB[WIDTH-1];
-                for (j = WIDTH-i-2; j >= 0; j=j-1)
-                    assign GG[j] = &PP[WIDTH-i-1:j+1] & (AA[i+j] & ~BB[i+j]);
-                assign P[i/cmp_width] = &PP[WIDTH-i-1:0];
-                assign G[i/cmp_width] = |GG[WIDTH-i-1:0];
+                    // Priority "encoder" that checks A[i] == 1'b1 && B[i] == 1'b0
+                    //   from MSB down, deferring to less significant bits if the
+                    //   MSBs are equal
+                    assign GG[j] = &PP[cmp_width-1:j+1] & (A[i+j] & ~B[i+j]);
             end
+            // Propagate only if all bit pairs are equal
+            //   (inconclusive evidence to say A >= B)
+            assign P[i/cmp_width] = &PP;
+            // Generate if any bit pairs call for it
+            assign G[i/cmp_width] = |GG;
         end
         // For $ge operation, start with the assumption that A and B are
         //   equal (propagating this equality if A and B turn out to be so)