Correct generateZeroPad.

grame-cncm · Mar 6, 2025 · 057107c · 057107c
1 parent bc9c332
commit 057107c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/compiler/generator/compile_scal.cpp b/compiler/generator/compile_scal.cpp
@@ -2143,7 +2143,7 @@ string ScalarCompiler::generatePermVar(Tree sig, Tree x)
 string ScalarCompiler::generateZeroPad(Tree sig, Tree x, Tree y)
 {
     return generateCacheCode(
-        sig, subst("(($0 % ($1 - 1) == 0) ? $2 : 0)", getCurrentLoopIndex(), CS(y), CS(x)));
+        sig, subst("(($0 == ($1 - 1)) ? $2 : 0)", getCurrentLoopIndex(), CS(y), CS(x)));
 }
 
 // Ondemand: generate the code of the ondemand circuit

diff --git a/compiler/generator/instructions_compiler.cpp b/compiler/generator/instructions_compiler.cpp
@@ -3549,9 +3549,8 @@ ValueInst* InstructionsCompiler::generatePermVar(Tree sig, Tree x)
 ValueInst* InstructionsCompiler::generateZeroPad(Tree sig, Tree x, Tree y)
 {
     return generateCacheCode(
-        sig, IB::genSelect2Inst(IB::genEqual(IB::genRem(getCurrentLoopIndex(), FIRIndex(CS(y)) - 1),
-                                             IB::genInt32NumInst(0)),
-                                CS(x), IB::genTypedZero(genBasicFIRTyped(sig))));
+        sig, IB::genSelect2Inst(IB::genEqual(getCurrentLoopIndex(), FIRIndex(CS(y)) - 1), CS(x),
+                                IB::genTypedZero(genBasicFIRTyped(sig))));
 }
 
 // Ondemand: generate the code of the ondemand circuit

diff --git a/compiler/parallelize/code_loop.hh b/compiler/parallelize/code_loop.hh
@@ -98,8 +98,8 @@ struct FIRCodeUSblock : public FIRCodeblock {
     Code block for downsampling blocks
 */
 struct FIRCodeDSblock : public FIRCodeblock {
-    ValueInst*  fDSfactor;  ///< downsampling factor
-    std::string fDSCounter;
+    ValueInst*  fDSfactor;   ///< downsampling factor
+    std::string fDSCounter;  ///< downsampling counter
 
     FIRCodeDSblock(ValueInst* ds_factor, const std::string& ds_counter)
         : FIRCodeblock(), fDSfactor(ds_factor), fDSCounter(ds_counter)
@@ -296,7 +296,7 @@ class CodeLoop : public virtual Garbageable {
     }
 
     /**
-     * Close the current/top US block.
+     * Close the current/top DS block.
      */
     void closeDSblock();
 

diff --git a/compiler/parallelize/loop.hh b/compiler/parallelize/loop.hh
@@ -64,7 +64,7 @@ struct CodeODblock : public Codeblock {
 };
 
 struct CodeUSblock : public Codeblock {
-    std::string fUSfactor;  ///< ondemand factor
+    std::string fUSfactor;  ///< upsampling factor
     std::string fLoopIndex;
 
     CodeUSblock(const std::string& us_factor) : Codeblock(), fUSfactor(us_factor)
@@ -74,8 +74,8 @@ struct CodeUSblock : public Codeblock {
 };
 
 struct CodeDSblock : public Codeblock {
-    std::string fDSfactor;  ///< ondemand factor
-    std::string fDSCounter;
+    std::string fDSfactor;   ///< downsampling factor
+    std::string fDSCounter;  ///< downsampling counter
 
     CodeDSblock(const std::string& ds_factor, const std::string& ds_counter)
         : Codeblock(), fDSfactor(ds_factor), fDSCounter(ds_counter)