From 338f44dfc8a35dbaa5ca3e1659916ed9bef24520 Mon Sep 17 00:00:00 2001
From: cturek <cturek@hmc.edu>
Date: Fri, 22 Jul 2022 16:45:19 +0000
Subject: [PATCH] Square root negative exponent handling

---
 pipelined/srt/sqrttestgen   | Bin 22792 -> 22792 bytes
 pipelined/srt/sqrttestgen.c |  33 ++++++++++++++++++++++++---------
 pipelined/srt/srt-waves.do  |   1 +
 pipelined/srt/srt.sv        |  22 ++++++++++++----------
 pipelined/srt/testbench.sv  |   8 ++++----
 5 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/pipelined/srt/sqrttestgen b/pipelined/srt/sqrttestgen
index 45fc6e7868a87d7e5f3b9308e340b3600a392273..7c6efb9f9085d76783d4192e98ba9cd8c44b8d24 100755
GIT binary patch
delta 1737
zcmY+FYfKzf6vyw~T^<Xw%q%T#2`vxPv^*@7BEeVa@)#HzAGEp&Hnma{H`N-&_<??)
zEC@7Au)5}Av-X3nHjT82Dd~KW7{d;rZX2U4iKb|4SkcBoG~#OPS~eZeojqWCley>q
z&i&tW&OLjR9lk_|FVSGs+36<M=zROTuv-^Xpo?B>p|kV!+QwHtdatqe_tAad?tOwB
zX?aW+a%MJbA=|;UOmB{tD3PfsyPYu`2o@6(7p1g?G;ZBPUeh!=Uqx1sXOY{HBgh@d
zVdPHakC6`}UqtRg{xHRXp`++HopQ*1Jo_nxVGi#g1UUo|LL5dA&Tu%6Fvg)DVVpw`
z!UTtI1l=$Gp~nMo<*o(Ov;fveVa-+hQ>vjp<bBA)$a|23$c@M$<cE;YAn!sRLoP=S
zjHBZ@N2>o5$hj!ck+YC5BioRp$hYwPJaQa4hWsnCfxMXF4MQv7h{y@kPRQh8cp2dr
z+4Zc_Kp!lPvq{qoQ+QN{3af~m<nL=q<Bt6{Li~!@J3S&Nm5`#2eokVhX#w<a&?0zG
zvH`9WLE$#vOVFq){|t^De?!o?Sbmwe`fJE+Tv_FPe_A$--H^$z6o|dLqRR6ikmrq0
zVb?E~T5`$3PG;{cEQTTm<RtAsmiz?*h;Q<TtBlAiiW)H**pJ!eIp_F0S0fXkBt{#{
z7fM<@5C}wxPq=UL!kq#Ew-oh@@U#5H@-3*@x5DL<cZFJHeL@KxXCDX^jo0BKez8i9
zb^o+{4=*+blk0J4PFy@V#T&pKatt(S4}iD(8g_BnZ~2YanCL2`FR@Bj#gXwl>skHR
zG~t4dfn&*<-qGNd8K0uwFk~o7omQh$iJ~dPO{e=8%>W@~;DL7PJa;zcUhCH?+$An{
zOg%H>uM~?0`NfG?#4ft>Jr1du_>>bnxP9``vKz|4Z<)r;gtp-NidJ{tG|dobixZ~V
z1-2b5Kb;PB>0o!k?-T?37gz#am}WnS50{O>sVeZ2<_t*!vlG70zz46@8e3s*hEHb=
z()N;ih<P9UdZZyoI&N!nrQ5gLg^WzH8C-9`w}+`xk!^XEU62ZMPeGyvaITAcwC|;V
z1h%q8p^Elk;aho51scdlJDaO%az<S#lC>@Oe@WM|mi<{<A*^lI!V%V2QIG>|BZLzl
zvZYxkuIak>8|^^dV7gOY*UZ%v+)b>seyg(`_kC<`_XZZD8?~PLM<`VQ^Xww&0PCST
zquxA+n{1Lao43+VqpZ5gLuJ<1bQRVm&7S<V<W@Z}Q3p&m7pY}?n?b3)(40Z(0rslg
z4Z)V=D(YqVEv+=p4#BLj^DW{0POM}t#I|%o+=Q3V-|B%h@3sc2t@eZ9W!TFlE}{uu
zOFoN-y3zkSHnTx%Q%(!?dA9Ua)q1}bR^qF3c3`>=b_nSIf1~$(by=IFR9Lw0qHml1
EKl{>MKmY&$

delta 1709
zcmZ9NZ){Ul6u|Fo_op4Nd#~F{-T!uO^RXi9oMf94tgdf+=swIq1rr?XOCvEc^@FJ~
zy3TCX)gjDW6XqAF`au?ASZJb)CTk~RC&r8!5~lc}L5OdHVfF(SEIiL`PaE(i@1FBJ
z=iGblIrpZWIzy+<(3uNnkCo(x=fhv()~J|=sOZTlQ8q^}*9^&@PMkWl^<u-38X7&e
z($TZqI})2UjFg%jl^&udm*&~M@|DmqB_u6MrSVcOtznO@>zuzrR*_F54<mn$ybt*V
z@<HTd$S)%wMGhdpm*-IU4K#%E24$RQe-mMf!|Mn$90CZl99}_)a_}RZ<S>db&tX5p
z0*Ac_3BPzVkq$x0^Y?T;2cR#2&ZC~lM}-r}k0CE3cOYLtZb4o{u0u{CS0QW27096t
zG(1z1?|%k4jZCmTe<GWZuOLgvzal?`{4=rx`8=|W{B54A!)`Dnm5gpAWKo5e5r3Bb
zRw0KDf~tL%)%7?$5TZpuODb9ZzSd8{G_7P+eg%`~@(;$UXa&>ZbG)Hxu|vtE#eGX@
zacd%?T>ZaSD*X~NYODY9&=(a=8-xsgRUAvG5oIl1ElSFo_8oZrqP)y+Bx7X9H@WK@
zA^C)or4w&wCGp5}aCmiE*-#@%ZHV32)KMAck2{iF;3w7guvWo2&;q+aQ08lHTYUfi
z06V(W$oKIBe8sIhx<2jO;Ngo8Z1oqL7M%1O_J!cGC!r;Nu~SI}f4{yN&ZeYbvh=Z=
zf^GA|210_Du~paoIj=Ux>MTukFYB|oUYNN*e;K5MYD%D*?y-+%emLt>BiFQHutNV5
zd{+VXON%2*g*Naj;B9^Btbd!>JjqKUVzY;>SZeL9l7slv4<6-m_t2JW>ckC`X1^WN
zEkDt&@qcuE7J@w)T@Qc^faJ^DZ|iyjB=3I;r0K4%6DaT!yDL7qWf@j=f|Yp7B?*KZ
zzN=t^=bIa?Fni%ku~F#}=LqcSgli>FS4!_1`YmO~2BT1JA`M_V4Br7ZCp8;LmYtWH
zs!l^f7Z{7d{@5MqmcRm52is^=sT}KTI%+e^&@VpRY_+@JJa5TUTdeW%A88S7?C<R^
zq2RQ^5;pFtuY}$a!ikTzTuhO8OrYgrY=6&WnYpbPv)Wz%ATfDotJ#hI?QHd_YL=ok
zvA1^api~C58AZ|y(q32i{mo^=$w;guBgPD#ZALoJy87+3jqU2c1iI5}uPq#=u!5F=
zX0Q+&d)^C?u|wW+N_Vi=lpu|=b)}O!Sna?d{ez9dEVH?Rc&!IdR@kDwj6h0$q<04G
zkmlpTP*?6sAmCN-RS^q0DR^?>E4V0#_8>Ob72Bnr5U9e|_jDHfFEgjF$J~qQdf6yY
Vq2eg}#Me`i!T%qq_lmFG_#ek*L<j%?

diff --git a/pipelined/srt/sqrttestgen.c b/pipelined/srt/sqrttestgen.c
index 7a45449f..17edc528 100644
--- a/pipelined/srt/sqrttestgen.c
+++ b/pipelined/srt/sqrttestgen.c
@@ -1,6 +1,6 @@
 /* sqrttestgen.c */
 
-/* Written 19 October 2021 David_Harris@hmc.edu
+/* Written 7/22/2022 by Cedar Turek
 
    This program creates test vectors for mantissa component
    of an IEEE floating point square root. 
@@ -15,6 +15,7 @@
 /* Constants */
 
 #define ENTRIES  17
+#define BIGENT   1000
 #define RANDOM_VECS 500
 
 /* Prototypes */
@@ -34,6 +35,9 @@ void main(void)
 			  1.75, 1.875, 1.99999,
 			  1.1, 1.5, 1.01, 1.001, 1.0001,
 			  2/1.1, 2/1.5, 2/1.25, 2/1.125};
+
+  double bigtest[BIGENT];
+
   double exps[ENTRIES] = {0, 0, 2, 3, 4, 5, 6, 7, 8, 1, 10,
         11, 12, 13, 14, 15, 16};
   int i;
@@ -44,13 +48,14 @@ void main(void)
     exit(1);
   }
 
-  for (i=0; i<ENTRIES; i++) {
-    aFrac = mans[i];
-    aExp  = exps[i] + bias;
-    rFrac = sqrt(aFrac * pow(2, exps[i]));
-    rExp  = (int) (log(rFrac)/log(2) + bias);
-    output(fptr, aExp, aFrac, rExp, rFrac);
-  }
+  // Small Test
+  // for (i=0; i<ENTRIES; i++) {
+  //   aFrac = mans[i];
+  //   aExp  = exps[i] + bias;
+  //   rFrac = sqrt(aFrac * pow(2, exps[i]));
+  //   rExp  = (int) (log(rFrac)/log(2) + bias);
+  //   output(fptr, aExp, aFrac, rExp, rFrac);
+  // }
 
   //                                  WS
   // Test 1: sqrt(1) = 1              0000 0000 0000 00
@@ -67,6 +72,16 @@ void main(void)
   //   output(fptr, a, r);
   // }
 
+  // Big Test
+  for (i=0; i<BIGENT; i++) {
+    bigtest[i] = random_input();
+    aFrac = bigtest[i];
+    aExp  = (i - BIGENT/2) + bias;
+    rFrac = sqrt(aFrac * pow(2, (i - BIGENT/2)));
+    rExp  = (int) (log(rFrac)/log(2) + bias);
+    output(fptr, aExp, aFrac, rExp, rFrac);
+  }
+
   fclose(fptr);
 }
 
@@ -105,6 +120,6 @@ void printhex(FILE *fptr, double m)
 
 double random_input(void)
 {
-  return 1.0 + rand()/32767.0;
+  return 1.0 + ((rand() % 32768)/32767.0);
 }
   
diff --git a/pipelined/srt/srt-waves.do b/pipelined/srt/srt-waves.do
index 2fbf40c1..f911968d 100644
--- a/pipelined/srt/srt-waves.do
+++ b/pipelined/srt/srt-waves.do
@@ -3,4 +3,5 @@ add wave -noupdate /testbench/srt/*
 add wave -noupdate /testbench/srt/sotfc2/*
 add wave -noupdate /testbench/srt/preproc/*
 add wave -noupdate /testbench/srt/postproc/*
+add wave -noupdate /testbench/srt/expcalc/*
 add wave -noupdate /testbench/srt/divcounter/*
diff --git a/pipelined/srt/srt.sv b/pipelined/srt/srt.sv
index 1b61bc14..3f6cad5f 100644
--- a/pipelined/srt/srt.sv
+++ b/pipelined/srt/srt.sv
@@ -389,11 +389,11 @@ module expcalc(
   input  logic           Sqrt,
   output logic [`NE-1:0] calcExp
 );
-  logic        [`NE-1:0] SExp, DExp, SXExp;
-  assign SXExp = XExp - (`NE)'(`BIAS);
-  assign SExp  = {1'b0, SXExp[`NE-1:1]} + (`NE)'(`BIAS);
-  assign DExp  = XExp - YExp + (`NE)'(`BIAS);
-  assign calcExp = Sqrt ? SExp : DExp;
+  logic        [`NE+1:0] SExp, DExp, SXExp;
+  assign SXExp = {2'b00, XExp} - (`NE+2)'(`BIAS);
+  assign SExp  = (SXExp >> 1) + (`NE+2)'(`BIAS);
+  assign DExp  = {2'b00, XExp} - {2'b00, YExp} + (`NE+2)'(`BIAS);
+  assign calcExp = Sqrt ? SExp[`NE-1:0] : DExp[`NE-1:0];
 
 endmodule
 
@@ -462,11 +462,13 @@ module srtpostproc(
   end
   assign floatRes = S[`DIVLEN] ? S[`DIVLEN:1] : S[`DIVLEN-1:0];
   assign intRes = intS[`DIVLEN] ? intS[`DIVLEN:1] : intS[`DIVLEN-1:0];
-  assign shiftRem = (intRem >>> (`DIVLEN - dur + 2));
-  always_comb 
-    if (Int)      Result = intRes >> (`DIVLEN - dur);
-    else if (Mod) Result = shiftRem[`DIVLEN-1:0];
-    else          Result = floatRes;
+  assign shiftRem = (intRem >> (zeroCntD));
+  always_comb begin
+    if (Int) begin
+      if (Mod) Result = shiftRem[`DIVLEN-1:0];
+      else Result = intRes >> (`DIVLEN - dur);
+    end else Result = floatRes;
+  end
   assign calcSign = XSign ^ YSign;
 endmodule
 
diff --git a/pipelined/srt/testbench.sv b/pipelined/srt/testbench.sv
index 513305b2..1b40c673 100644
--- a/pipelined/srt/testbench.sv
+++ b/pipelined/srt/testbench.sv
@@ -53,7 +53,7 @@ module testbench;
  
   // Test parameters
   parameter MEM_SIZE = 40000;
-  parameter MEM_WIDTH = 64+64+64+64;
+  parameter MEM_WIDTH = 64+64+64;
  
   // Test sizes
   `define memr  63:0 
@@ -70,9 +70,9 @@ module testbench;
   integer testnum, errors;
 
   // Equip Int, Sqrt, or IntMod test
-  assign Int =  1'b1;
+  assign Int =  1'b0;
   assign Mod =  1'b0;
-  assign Sqrt = 1'b0;
+  assign Sqrt = 1'b1;
 
   // Divider
   srt srt(.clk, .Start(req), 
@@ -101,7 +101,7 @@ module testbench;
     begin
       testnum = 0; 
       errors = 0;
-      $readmemh ("inttestvectors", Tests);
+      $readmemh ("sqrttestvectors", Tests);
       Vec = Tests[testnum];
       a = Vec[`mema];
       {asign, aExp, afrac} = a;