Skipping zero partial products.

src/base/wlc/wlcBlast.c

@@ -1131,14 +1131,15 @@ void Wlc_BlastBooth( Gia_Man_t * pNew, int * pArgA, int * pArgB, int nArgA, int
             int This = i == nArgA ? FillA : pArgA[i];
             int Prev = i ? pArgA[i-1] : 0;
             int Part = Gia_ManHashOr( pNew, Gia_ManHashAnd(pNew, One, This), Gia_ManHashAnd(pNew, Two, Prev) );
-            
             pp = Gia_ManHashXor( pNew, Part, Neg );
             if ( pp == 0 || (fSigned && i == nArgA) )
                 continue;
-
+            if ( pp )
+            {
                 Vec_WecPush( vProds,  k+i, pp );
                 Vec_WecPush( vLevels, k+i, 0 );
             }
+        }
         if ( fSigned ) i--;
         // perform sign extension
         Sign = fSigned ? pp : Neg;
@@ -1150,13 +1151,19 @@ void Wlc_BlastBooth( Gia_Man_t * pNew, int * pArgA, int * pArgB, int nArgA, int
             Vec_WecPush( vProds,  k+i+1, Sign );
             Vec_WecPush( vLevels, k+i+1, 0 );
 
+            if ( Sign != 1 )
+            {
             Vec_WecPush( vProds,  k+i+2, Abc_LitNot(Sign) );
             Vec_WecPush( vLevels, k+i+2, 0 );
             }
+        }
         else 
         {
+            if ( Sign != 1 )
+            {
             Vec_WecPush( vProds,  k+i, Abc_LitNot(Sign) );
             Vec_WecPush( vLevels, k+i, 0 );
+            }
 
             Vec_WecPush( vProds,  k+i+1, 1 );
             Vec_WecPush( vLevels, k+i+1, 0 );

src/base/wln/wlnRtl.c

@@ -143,13 +143,15 @@ Rtl_Lib_t * Wln_ReadSystemVerilog( char * pFileName, char * pTopModule, char * p
     int fSVlog = strstr(pFileName, ".sv") != NULL;
     if ( strstr(pFileName, ".rtl") )
         return Rtl_LibReadFile( pFileName, pFileName );
-    sprintf( Command, "%s -qp \"read_verilog %s %s%s; hierarchy %s%s; %sproc; write_rtlil %s\"", 
+    sprintf( Command, "%s -qp \"read_verilog %s%s %s%s; hierarchy %s%s; %sproc; write_rtlil %s\"",
         Wln_GetYosysName(), 
+        pDefines   ? "-D"       : "",
         pDefines   ? pDefines   : "",
-        fSVlog ? "-sv ":"", pFileName, 
+        fSVlog     ? "-sv "     : "",
+        pFileName,
         pTopModule ? "-top "    : "", 
         pTopModule ? pTopModule : "", 
-        fCollapse ? "flatten; " : "",
+        fCollapse  ? "flatten; ": "",
         pFileTemp );
     if ( fVerbose )
     printf( "%s\n", Command );
@@ -172,11 +174,12 @@ Gia_Man_t * Wln_BlastSystemVerilog( char * pFileName, char * pTopModule, char *
     char * pFileTemp = "_temp_.aig";
     int fRtlil = strstr(pFileName, ".rtl") != NULL;
     int fSVlog = strstr(pFileName, ".sv")  != NULL;
-    sprintf( Command, "%s -qp \"%s %s%s%s; hierarchy %s%s; flatten; proc; %saigmap; write_aiger %s\"", 
+    sprintf( Command, "%s -qp \"%s %s%s %s%s; hierarchy %s%s; flatten; proc; %saigmap; write_aiger %s\"",
         Wln_GetYosysName(), 
         fRtlil ? "read_rtlil"   : "read_verilog",
+        pDefines  ? "-D"        : "",
         pDefines  ? pDefines    : "",
-        fSVlog ? " -sv ":" ", 
+        fSVlog    ? "-sv "      : "",
         pFileName,
         pTopModule ? "-top "    : "-auto-top",
         pTopModule ? pTopModule : "",