Add flag to skip vcounters check

0xPolygonHermez · Feb 14, 2024 · 7d02e3c · 7d02e3c
1 parent 5189e7d
commit 7d02e3c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -32,7 +32,7 @@ jobs:
           npm run test:zkasm
       - name: Generate tests
         run: |
-          npm run test:gen
+          node tools/parallel-testing/gen-parallel-tests.js
       - name: Run tests
         run: |
           export NUM_CPUS=31

diff --git a/main/opcodes/logs.zkasm b/main/opcodes/logs.zkasm
@@ -136,11 +136,11 @@ initLogLoop:
     0 => HASHPOS
     32 => D
     $ => B                                                  :MLOAD(currentLogIndex)
-    $ => E          :MLOAD(nextHashPId)
+    $ => A          :MLOAD(nextHashPId)
     ; Update nextHashPId
-    E + 1           :MSTORE(nextHashPId)
+    A + 1           :MSTORE(nextHashPId)
     ; store nextHashPId to aux variable
-    E               :MSTORE(logNextHashPIdAux)
+    A               :MSTORE(logNextHashPIdAux)
 
 logLoop:
     ; checks zk-counters

diff --git a/tools/parallel-testing/gen-parallel-tests.js b/tools/parallel-testing/gen-parallel-tests.js
@@ -18,6 +18,7 @@ const pathMainPil = path.join(__dirname, '../../node_modules/@0xpolygonhermez/zk
 const inputs = [];
 const testsFolder = path.join(__dirname, 'parallel-tests');
 const sampleDir = path.join(__dirname, 'parallel-tests-sample/sample.test.js');
+const { argv } = require('yargs');
 
 async function genTestsFiles() {
     if (!fs.existsSync(testsFolder)) {
@@ -26,7 +27,11 @@ async function genTestsFiles() {
     for (const inputPath of inputs) {
         const name = inputPath.split('/').slice(-1)[0].replace('json', 'test.js');
         const sample = fs.readFileSync(sampleDir, 'utf-8');
-        const test = sample.replace('%%INPUT_PATH%%', `${inputPath}`);
+        let test = sample.replace('%%INPUT_PATH%%', `${inputPath}`);
+        // Replace skip vcounters flag
+        if (argv.skipVCounters) {
+            test = test.replace('%%SKIP_VCOUNTERS%%', 'yes');
+        }
         fs.writeFileSync(`${testsFolder}/${name}`, test);
     }
     expect(true).to.be.equal(true);

diff --git a/tools/parallel-testing/parallel-tests-sample/sample.test.js b/tools/parallel-testing/parallel-tests-sample/sample.test.js
@@ -23,6 +23,7 @@ const checkerDir = path.join(__dirname, 'checker.txt');
 const inputPath = '%%INPUT_PATH%%';
 const nameFile = path.basename(inputPath);
 const input = JSON.parse(fs.readFileSync(inputPath, 'utf8'));
+const skipVcounters = '%%SKIP_VCOUNTERS%%';
 
 it(`${nameFile}`, async () => {
     if (fs.existsSync(checkerDir)) {
@@ -55,7 +56,9 @@ async function runTest(cmPols, steps) {
         };
 
         const res = await smMain.execute(cmPols.Main, input, rom, config);
-        compareCounters(input.virtualCounters, res.counters);
+        if (skipVcounters !== 'yes') {
+            compareCounters(input.virtualCounters, res.counters);
+        }
     } catch (err) {
         fs.writeFileSync(checkerDir, `Failed test ${inputPath} - ${err}}`);
         throw err;