From 010ab2e90e00463142b7611b113e56d42c86d834 Mon Sep 17 00:00:00 2001
From: cturek <cturek@hmc.edu>
Date: Thu, 7 Jul 2022 22:48:46 +0000
Subject: [PATCH] Seventeen Square Root Tests

---
 pipelined/srt/Makefile      |   5 ++--
 pipelined/srt/sqrttestgen   | Bin 13168 -> 22792 bytes
 pipelined/srt/sqrttestgen.c |  39 ++++++++++++++-----------
 pipelined/srt/testbench.sv  |  56 ++++++++++++++++++++++--------------
 4 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/pipelined/srt/Makefile b/pipelined/srt/Makefile
index f2ed6f8ca..5d7898b17 100644
--- a/pipelined/srt/Makefile
+++ b/pipelined/srt/Makefile
@@ -1,7 +1,8 @@
-all: exptestgen testgen qslc_r4a2 qslc_r4a2b qslc_sqrt_r4a2
+all: exptestgen testgen qslc_r4a2 qslc_r4a2b qslc_sqrt_r4a2 sqrttestgen
 
 sqrttestgen: sqrttestgen.c
 	gcc sqrttestgen.c -o sqrttestgen -lm
+	./sqrttestgen
 
 testgen: testgen.c
 	gcc testgen.c -o testgen -lm
@@ -28,5 +29,5 @@ inttestgen: inttestgen.c
 	./inttestgen
 
 clean:
-	rm -f testgen exptestgen qslc_r4a2 qslc_r4a2b qslc_sqrt_r4a2
+	rm -f testgen exptestgen qslc_r4a2 qslc_r4a2b qslc_sqrt_r4a2 sqrttestgen
 	
diff --git a/pipelined/srt/sqrttestgen b/pipelined/srt/sqrttestgen
index d4b68062699e467b77274618e35a4e7cd2690e24..dadc5dc5c8d36055ee1c68c8296279c302aa4efb 100755
GIT binary patch
literal 22792
zcmeHPe{dAneSf+`ATZn=F&G(RYwd!=4|5VfBjOU>2@aiH@xvftNR3yAbSGVXx|2_P
zMtEXJtuXNggVoeYi2q2LPUAYBwBt#~jGJb#2r=MHCczy~%7nC4TyRb{j?csp#lc*^
z-?!iI-R|D5<7TF5UEc%U_kBO#AN$_-y?y)k?e6=0sBMF*s!DKjiO&e+#-;=$r2h)>
z*xiyPtWiuA0db4CSxg3G68r_E1gV~5Izg_P){veXDB3l;bfD1{kQt`)bXYLu5+bc8
znN9-4>C`t<XPFA2NC54ytofTI3$#;anC_!;93jef$f6xoR!_Hdn&=o6j49U->xO^r
z<geWo01o*860u(XmMH3C+Hyhb#(ck5vOohe!?az81yi=W8|-8`N&dTtj}*4j@toq~
zqw+JQ>WcbAeD~^=^@;AKiFh(IxOA{__0rWV{R1iga#?TmkGd_JI^>bCy*ad4=2`HE
z7|Jh;ssHrq7jE|)3q1d&ujW2=*X3D%|8>-5AF^Khfu#$?*IYWlT?4rCbR9rSIV>Il
z>=QQl76)8)zy}@hBM$gs2mF(OEAVGcX#niXiS2HO_c`Ey>42{WT!BAp`YZr;{vUO~
zzX<qDQ7eX&PRI$t{a--;=)>-?TBxn<8`bV;I@%K-(4y(~jq4JrWVAi9I}sJC+S8Xx
zssmait*NT6YOC0v+9P6#R4Oe79!P5<k?O%Cbm>Qk4#qVROZ7*SBG#YLx<sriks64K
zbR^j=1~fQ!TEzCG<60Et>3C9$!GY174%`=sCq+wJYx6pFxqrET71W~&daE1$x#T~c
z!+aHCRgl9jiG5Llzs%hDRP52;hCC*eb^%2>CSC3-%E#(DC60X?{cy?|aO3%$H{it>
zgVBTmpTSOma(m!d$z?!sEw$4W$n*J#xMINF2vAyRz<I1eQG)?Dj>nA#9FM^%V89_z
z#S}K+(~2mJg9aSWWllQ`_;dz=b{cSx0q-^7G^9%Due`Us7aqP?6FyKqUaN@kqobOu
za3(zb{hAX7Yat4&UITGq!Fl-g)&(Gkd@t&Zj};&-_$l((gyUx<|1Zd6Xvaq-{{!UR
z$Ui6f?;($&96uuY?;wvM93PSVw~@!DA0LwZv&ds8$NMG!H^^fb81Iz)Q^;dT$G1rS
zOUPp=#{<A)J(s=JntkQIaQ3zE@cI0f_SRFQ`56HbK6QLZl2a#ZpkA|oI!6)jj-dXD
znBQBs4?GAl5<a;0Zg3brSbZ0gH51xw2-(x1iy@m@81vQ*q2dXmpnt2>Uo{uWqHE#f
z*WBT3K72ga6s|fMe&w1r3miO54r&TxF>l@al06=OXzg1d7Mbfi!r2SChoBZGtIq*a
zwd=&liCC#{*dD0=<`+>h{O1?9Kr>wO`l`PG;k@LX`6vbe`Ogy{CVmg`7%-Hlh~Ghc
z5Ahgal&i$|5`Pcz*dQq1O#C46Ejk|>LSZv8k0G;`m=R<ei8+kS3Sy2R<0s}BWEK(g
z95VBXc>$R^Vn$=$w@0zU&t20Cv>*Bx@-Gm7jrdXGuMmHl_+Ju#hWOWsKTG_-6F)}$
zPl(SE|0Ck_#GfR7g7{;^3kuLt;%kWi2jYFiKTUis@n0uiA^t1GFC_jD@eRPA3QZK?
zbURk-35XZx!cXq-)j}bh4duhb59dW@A#}g}v!QQhkAG)A^xR{3?!MT7ihm7?FCv?J
z6mq9RS0O9L{|<f*gsz6MnfAS;_o<no97B)4q(^;mXyTH0$MH+vJ4Umi^9MrbmmskC
zG&a;DP@vo^zs1Jc8Or5az<Vt0ePk3$br$5Iv$^ksFy>t-wNHcgCGUNZH~D-OG&i0-
z(18>VzwvzdKq#O6Q8;@lhm+dj(ABEphp+m)hc-hLP==B=@H_JI33-AHUsS@`hbOX`
zccE{Da@meN(2ZjUI^G5CiDMlQ0x)?2E1heXg@xmw2pw$(RL`G$5hq2t+d$($N50(j
zMlu~^Q=IFuDGp4zU%Y26R1Qlt_NE7`HU?qD-i#Sv^*=*<#Ju&Pu|5C!<_#qF%~%Qp
zEQAQ6t*eD#7^$zG1L&S})NXIaq;~FEI2c71J>FZi*(m*Qlb&`KQPjC(^lQi8m{)aX
zc+9)#Og1!epko5cpF8$hV}zE2Ux@i6i1~^~o}?J(J_jhY+bA4+Mhz8`+cgh$$1bwV
zFu>yY6}+c4`>(<6t=TKVj$rovV0+ua1?@gXbc7EsMY^qR(FMF#<yw9N4SW23w^q08
z9F4ba+4tJASJr3W4i;wpEIfRoD!k_3GH>8@>`!+E?+xw>-WODjW2PM6p&Ur%^^dN2
zIKwffJ#wC<MF+G8qg`4mJwU>BsZ63f`AJQY(<ucfV+JK97EeT{i3JTS2E_uLB2&sY
z>6r<l?-IR4^c|vCiC$|ubmupQFBb|;Pkjy3J54KO`c>1Sd!P8;<%RjCKl`rsSGAM!
zO%HtQz`0(LZ<@19dnGjIt)>o{E|A@L)4Wp;!2gTnR|NEOzy(hxAJJJvYl+Syst~=6
z=zOBL6J1DjG0{7S`iV9K-d^+GwPye8^7x~L{|Hpw<h~Q<@OZ&~?$?C^-WT*w6bk)7
zj{w~VbUQTjD9}AHOpF1Y{(hl=lf-jC6`(#CRRchWfIbEk6P{z3svg=Zss?>kH%*^X
zGlIH+&4a%QI95F>te@gTtO5RJ!SUb<A`^~;>*3D_dZUPVd>cHqcX_YdQ!^x*=H9t@
z#r)e4Mqdf|I|R13;;bg<@$Gl5n=#ov&kcu^^2Y&w0tSIE11-v3BPf>gZvi|B>h@!k
z{0Bw(4*~y2kS{UHV^S>3coFc^AdjMagU9!TE99v?<PLe1gOfs@g^yQ<Jq`OOhdqtM
zQ(8QMq^B|HX$X22HhYw2Pi?cu*X*g0aajrR$%7w`0lKTCN(3qqs6?O=fl34_5vW9<
z5`jttDiNqe;QvbmM(NgfgecuU;_anOOuLAmPIO{&K<4-v!vriHW4clP;&atbnY)R2
zT%g7@S0`eE<aqyxiRG8C6;j9_b_I|WpY86Lr1Sg?WYnee(}bRm5#?tCwZzXR$^>sw
zWl}mN;Z=?rswm$#^RtRMy0*wy2V{=%LE^dGgQUmLGWhs#OD^lvNcyl8CwV?@p7<L`
zPHz792tUuZlwkFgfJ8PB-A*({^g*KgiGGFX(?pLFJxTN@MA2!>x^<sc7Q&O?MM|T8
zmA^q*-mrXG!>VN~m4#cQ-AXv3>G;xR4U148+Zfj@u#>g~=U1)hU)HdEjSyby!%XW?
z2a~Q>oz5ha@nnzE)751;kPuegNHUq)9Z%Zoavx{E{fSHus3s$Q(N8O6h==9AsOv3m
z*?f;!9D;`DK1{gm3SKn8B+I%49)Nb;uXZIO1HD3AuS-a_xGSdir&Ag%!^KlcJaPCO
zB!3$=Z*6bguu~M!>;{wV68TVb#||~PZCePmHgDPna!Yxp;5kxlvb$AwbBnK3UtCjT
zX{fc@pMr;|(R8`5$@uJ;UcsR9->TOw9gQU7JxM%_Q+tk4A7N^3qe^>L+SBe_uAHAZ
zE-tB@pOx_z`axy9{kUE~eU<qT^#8>lx%m*z=Wu?Dui;wD&uu!J+7{<zC0+aZfYqil
z->S@?;l8PIKNPe-Un=)QFsNXn`{v61ZRP&9)E^dq?AI%BF~qd~6j@gMK8Dwx>~vVh
z)J})5>rCx*c<t3g>m#;0GXk>7gh!`#IttAp@O@uQPV)kMEf~{fq92uY7+lBtA6QqD
z{ok?{_Mz6*(C`nruI4b0l;!6(y+CdHVdjxmn-B8Oe!0(l82?rqr~b(6flMp?@%LNj
z{X_T1N_&2&`;L#y_)=-lN_+lazK{I4U;pjqe0)7-`upne-1GVmn1k}%vzq3hIEVb8
z<c1s0MpvLr1;4s%x5eE;v&APB-ybkKbHnUw)K-78;P(s6`cs76b9pyBbmiyyX8oyx
z-wQC~(~9p8nDOfb&*jbdbfHjO&G?MseTEtL2!8*<jC)0mP3+xp_rl+goAqak)82p)
zl6g0L0nG1n7=><lGR^OCm~nWE!sa~!x0o%)>N<_8GVjKx)bu`vQRo(PM87Rw`o7q#
zUwrasgyAdPxne{)V!~i)1HMatM?NDr3f3ayno)e0fMpvU@Ce~N7iIm71Afo}f7$^*
z;eelWz<=$4Psa*Fy{zS2Ksc`vqdBIvg!8?sjta5U!B55k|FQ#q)B!)|fdAG3ufy4r
zO}+lu0pCTqwZ3w{2k^u9-CW;qg1%ipd7k|6JrV1_OgN9PjQ^Z)Yy5xXfX~K@mrcEv
zJK)<K@RS4ogaiJJ1O5`>*7}|&obTPZzEzX-@>_9*aBF<l0&W-QFyJnD!-dx>*#BLG
zZ=tmd#&;1uV!;OhuY!FE9#cA{Dt0GKe<AVmaqOGqhu@FWwS{<I>X(m)uL5pYey4i9
zCjHD5(`N?Qb&=Zn$%8)b#9$q7t6)K)3cvQUjJMMOM}6zKeY3>N$NvWDr+ggV0Qe^$
z{`iGBCTR|IJ7g3DEa?r2myg?N^7D)90@6Z$3kJEpfcs#a*Qj0C-H_C0u0*#W?kd0D
zJ?WtT4F~+F1OBoDo&y}qX}um@cF>;&4-u47v5UDI0iWse3ZLb=d^_TzbiJ0%4OXiF
z$N2Mk7bQ>a(1Cr>pGPcl3!y%Y8$7;2@nrg?EN5x_uP1yL=%XKN{Nr?7UK^C(_JK{3
z@Xt*TNDn_IKYIxO6Y3{R2;V1hVhrS~4*0VU_;(%fGl0)@%@Ko^IQ$H7#c({%UUBf#
zgt)7GK2`%SeBwK7)-)Gz+kH;zGXrVd45uF6Osa=naMaZ+m!_lLy%9~{8K=In-tRB{
z2Tj;Erz@>3^QVNLULI8A$++h4vhr#awlA^h_<K{D6+=Bc+@DD%;`c`rdu<Jzgnqdh
zOQzq}$U)|pJFr-aDvM<nfVmd$Qq$2ys>@hkGj6W8S!S-MSymngv)m>gW(Db>JT7LX
z^7xqL(g{Fm%@{+ojwN1Zp>$x5o7$bwgBH=ExMvLpu|FQwi&APRCpGLx(L`*i>}IKL
zB?AD<`d$gcg4pSr+rX^vB(sUV#jrf?C57^smt^+wF3ByiE(z@7tnUicHIUK6BAc-k
z0@^gFC^p5%AdEqv%i5;oT8hyYhJgVs13Q{@iPHW^s@4ZD0>chT1F%U^cS`L^q;^LV
zYBzp_uSPP1qAS(cpNMMFZvUs2uUTcUq~bBuNID(a3)R%pdxieuZg-}yZ!ee_I9XGZ
zDu2}96HP+NRCUAF;Kq;|+O!^bXfmsJ3w8a@O~H+=>&y~8aH<L~d8?r?c?hrHD%6&?
z&CS6!b@PS|+d}PXd$74JgkI%tOc+=!_y=womC9(a$CFT_-4QK9J3R#g#@(A>uP8GB
zyG5A+xl5E8D%%jsD#pX<`$h34QdSM~R#s~FKuYa}9jI`dtJck6+8s}-nSm(8tW;e*
zC56Lz3wpZ;2I!b_k1Dx&Rc~}q?rfFngSNm>$epjug^^ojnIRle%!s}vmKjr3*q@8r
z8aM8;-Hi)-h}jOe+A<^hzFTHY_y_j(X_4JPwX{xqIVayJhpSE!UUl~en_HJ^ksjiD
zk{SQ*OdK|wi^G6~Tra*T@9*B51b;f!(z@iqXnFwOlb345s33!DP6Q1o*PnpPs0_Ye
ziw;6w_B($%C3}@W+DoTMZ#UR7r(5Xfif+Mqa2)B2!xg*-FVFDfmj}?DK_d!3oV9&$
zChFyqmGMV3Egj#Tf&DYAvyJ~gkKf(E6tTFA2d}H~{)+tF4SPmiWBMatV2V?;=k+(<
zzfdtML!RfW3@?L>(Vo}oG`!!1G+!shU#tCkkX(UpV@SQYo_E+{&+}Vc$26u*z~J)<
zwjXr`fD^F(Cy6*r6^3b_j1$}QcRSkwcf%js^ZMWpDky(%q<hnSa31M>@Q2^}usyFM
z-arMujg-0ktjF|zkmI*Q%=3C9?h%D4Ab<65H&BPmPq26hGFVi$=XJ?JvL7TxK0e!X
z{r8c5GwJd7PkA!n@1>B%XS-JWLx5q3F}|31opXW!{w_?HmiM152#og1lz>!Kuv0-A
zmA|DQ`921)OrM0j(Vo{`#>jp)7mQr69eaGrV$bWV6Zp^@5)qw&U+NY`{s`po_#A&;
zhpqAGDsqQ7Ju81XehfVW8KXU~*YZA~?W{=Ddi<jndtTQ)?bQv!=-iO3#~%e578TC{
zOuUZ3`+{2anP>V#u)#yIJ+E6#+>G8z{YB?WJlmfI0X7la7uPp#(JjWP{M?Le$L;uY
zP(u~A=XK{XdRaix-4uV>p6Tl#G1?c`r^&FtXsKt|j_KPLdtNu_CwpsqQFV%5FGCJ}
zaruXoPAStANs9ek=Y$}bS@9m^&}Tyt(KBqn)PnQznYtlEr;60%_4B_~bi)^@9odat
zeYo$l4${ug=-k*eo#J(9EBtZXc>KZdD7o&srv4jf)v4cDIDoj^tc%~A+1V$z=o&X#
I3@ohpFY^DA2mk;8

literal 13168
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
SCY%1#;?NhKaWW<o%l-oj<*mU0

diff --git a/pipelined/srt/sqrttestgen.c b/pipelined/srt/sqrttestgen.c
index 7b8cacd3f..32c93f343 100644
--- a/pipelined/srt/sqrttestgen.c
+++ b/pipelined/srt/sqrttestgen.c
@@ -19,7 +19,7 @@
 
 /* Prototypes */
 
-void output(FILE *fptr, double a, double r);
+void output(FILE *fptr, int aExp, double aFrac, int rExp, double rFrac);
 void printhex(FILE *fptr, double x);
 double random_input(void);
 
@@ -28,12 +28,16 @@ double random_input(void);
 void main(void)
 {
   FILE *fptr;
-  double a, b, r;
-  double list[ENTRIES] = {1, 1.5, 1.25, 1.125, 1.0625,
+  double aFrac, rFrac;
+  int    aExp,  rExp;
+  double mans[ENTRIES] = {1, 1.5, 1.25, 1.125, 1.0625,
 			  1.75, 1.875, 1.99999,
 			  1.1, 1.2, 1.01, 1.001, 1.0001,
 			  1/1.1, 1/1.5, 1/1.25, 1/1.125};
-  int i, j;
+  double exps[ENTRIES] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 16};
+  int i;
+  int bias = 1023;
 
   if ((fptr = fopen("sqrttestvectors","w")) == NULL) {
     fprintf(stderr, "Couldn't write sqrttestvectors file\n");
@@ -41,28 +45,31 @@ void main(void)
   }
 
   for (i=0; i<ENTRIES; i++) {
-    a = list[i];
-    r = sqrt(a);
-    output(fptr, a, r);
+    aFrac = mans[i];
+    aExp  = exps[i] + bias;
+    rFrac = sqrt(aFrac * pow(2, aExp - bias));
+    rExp  = (int) (log(rFrac)/log(2) + bias);
+    output(fptr, aExp, aFrac, rExp, rFrac);
   }
   
-  for (i = 0; i< RANDOM_VECS; i++) {
-    a = random_input();
-    r = sqrt(a);
-    output(fptr, a, r);
-  }
+  // for (i = 0; i< RANDOM_VECS; i++) {
+  //   a = random_input();
+  //   r = sqrt(a);
+  //   output(fptr, a, r);
+  // }
 
   fclose(fptr);
 }
 
 /* Functions */
 
-void output(FILE *fptr, double a, double r)
+void output(FILE *fptr, int aExp, double aFrac, int rExp, double rFrac)
 {
- printf("sqrt(%lf) = %lf\n", a, r);
-  printhex(fptr, a);
+  fprintf(fptr, "%03x", aExp);
+  printhex(fptr, aFrac);
   fprintf(fptr, "_");
-  printhex(fptr, r);
+  fprintf(fptr, "%03x", rExp);
+  printhex(fptr, rFrac);
   fprintf(fptr, "\n");
 
 
diff --git a/pipelined/srt/testbench.sv b/pipelined/srt/testbench.sv
index 6af2174bc..e7ee7b29b 100644
--- a/pipelined/srt/testbench.sv
+++ b/pipelined/srt/testbench.sv
@@ -118,12 +118,11 @@ module testbench;
   
   // Apply directed test vectors read from file.
 
-  always @(posedge clk)
-    begin
-      r = Quot[(`DIVLEN - 1):(`DIVLEN - 52)];
-      rInt = Quot;
-      if (done) begin
-        if (~Int) begin
+  always @(posedge clk) begin
+    r = Quot[(`DIVLEN - 1):(`DIVLEN - 52)];
+    rInt = Quot;
+    if (done) begin
+      if (~Int & ~Sqrt) begin
         req <= #5 1;
         diffp = correctr[51:0] - r;
         diffn = r - correctr[51:0];
@@ -139,24 +138,38 @@ module testbench;
             $display("%d Tests completed successfully", testnum);
             $stop;
           end
-        end else begin
-          req <= #5 1;
-          diffp = correctr[63:0] - rInt;
-          diffn = rInt - correctr[63:0];
-          if (($signed(diffn) > 1) | ($signed(diffp) > 1) | (diffn === 64'bx) | (diffp === 64'bx)) // check if accurate to 1 ulp
-            begin
-              errors = errors+1;
-              $display("result was %h, should be %h %h %h\n", rInt, correctr, diffn, diffp);
-              $display("failed\n");
-              $stop;
-            end
-        if (afrac === 52'hxxxxxxxxxxxxx)
+      end else if (~Sqrt) begin
+        req <= #5 1;
+        diffp = correctr[63:0] - rInt;
+        diffn = rInt - correctr[63:0];
+        if (($signed(diffn) > 1) | ($signed(diffp) > 1) | (diffn === 64'bx) | (diffp === 64'bx)) // check if accurate to 1 ulp
           begin
-            $display("%d Tests completed successfully", testnum);
+            errors = errors+1;
+            $display("result was %h, should be %h %h %h\n", rInt, correctr, diffn, diffp);
+            $display("failed\n");
             $stop;
           end
-	      end
+        if (afrac === 52'hxxxxxxxxxxxxx)
+        begin
+          $display("%d Tests completed successfully", testnum);
+          $stop;
+        end
+      end else begin 
+        req <= #5 1;
+        diffp = correctr[51:0] - r;
+        diffn = r - correctr[51:0];
+        if (($signed(diffn) > 1) | ($signed(diffp) > 1) | (diffn === 64'bx) | (diffp === 64'bx)) // check if accurate to 1 ulp
+          begin
+            errors = errors + 1;
+            $display("result was %h, should be %h %h %h\n", rSqrt, correctr, diffn, diffp);
+            $display("failed\n");
+            $stop;
+          end
+        if (afrac === 52'hxxxxxxxxxxxxx) begin 
+          $display("%d Tests completed successfully", testnum);
+          $stop; end 
       end
+    end
     if (req) begin
       req <= #5 0;
       correctr = nextr;
@@ -169,7 +182,6 @@ module testbench;
       {bsign, bExp, bfrac} = b;
       nextr = Vec[`memr];
     end
-    end
- 
+  end
 endmodule