arnaucube
/
circom
mirror of https://github.com/arnaucube/circom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

assert working

master
Jordi Baylina 4 years ago
parent
f02ceb2508
commit
aa2d768465
No known key found for this signature in database GPG Key ID: 7480C80C1BE43112
9 changed files with 100 additions and 19 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      cli.js
  2. +35
    -14
      package-lock.json
  3. +3
    -3
      package.json
  4. +6
    -0
      ports/c/builder.js
  5. +30
    -0
      ports/wasm/build_runtime.js
  6. +12
    -0
      ports/wasm/builder.js
  7. +1
    -0
      ports/wasm/errs.js
  8. +5
    -1
      src/construction_phase.js
  9. +6
    -0
      src/gencode.js

+ 2
- 1
cli.js
View File

@ -24,6 +24,7 @@
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");
const Scalar = require("ffjavascript").Scalar; const Scalar = require("ffjavascript").Scalar;
const stringifyBigInts = require("ffjavascript").utils.stringifyBigInts;
const fastFile = require("fastfile"); const fastFile = require("fastfile");
const compiler = require("./src/compiler"); const compiler = require("./src/compiler");
@ -153,7 +154,7 @@ run().then(()=> {
if (argv.verbose) console.log(err.stack); if (argv.verbose) console.log(err.stack);
} }
if (err.ast) { if (err.ast) {
console.error(JSON.stringify(err.ast, null, 1));
console.error(JSON.stringify(stringifyBigInts(err.ast), null, 1));
} }
process.exit(1); process.exit(1);
}); });

+ 35
- 14
package-lock.json
View File

@ -203,11 +203,11 @@
"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=" "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
}, },
"circom_runtime": { "circom_runtime": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/circom_runtime/-/circom_runtime-0.1.2.tgz",
"integrity": "sha512-qh1GsfxXLGAhLBcIQWrFHO/zu6kuXQQL1xC3+P8KRETvynTbBVSb1ul3dCiXyetm7lVNNdhb1/UoOCEZ6yu1RQ==",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/circom_runtime/-/circom_runtime-0.1.4.tgz",
"integrity": "sha512-sQWeEBD3o2jIdrKPf3VDu7DNfP+NfscYO/pxi73FE0qQW8TXTfwno8Grdl++h6OKWbzvWJdG5jQvS+WGKjpMOg==",
"requires": { "requires": {
"ffjavascript": "0.2.4",
"ffjavascript": "0.2.10",
"fnv-plus": "^1.3.1" "fnv-plus": "^1.3.1"
} }
}, },
@ -334,9 +334,9 @@
"dev": true "dev": true
}, },
"ejs": { "ejs": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz",
"integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==",
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz",
"integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==",
"requires": { "requires": {
"jake": "^10.6.1" "jake": "^10.6.1"
} }
@ -571,9 +571,9 @@
"integrity": "sha512-0EZo2y5eW8X0oiDDRvcnufjVxlM96CQL5hvmRQtbRABWlCkH73IHwkzl0qOSdxtchaMr+0TSB7GVqaVEixRr1Q==" "integrity": "sha512-0EZo2y5eW8X0oiDDRvcnufjVxlM96CQL5hvmRQtbRABWlCkH73IHwkzl0qOSdxtchaMr+0TSB7GVqaVEixRr1Q=="
}, },
"ffiasm": { "ffiasm": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/ffiasm/-/ffiasm-0.1.0.tgz",
"integrity": "sha512-fQI7b6oye7Yw3t28ku9XuhPSwwzKMeqB0pkIaGPrKl9s/ipV90o8J4Ge0s5F0UsH5Mu2wfr3hFQ2sGF+vQk5Sg==",
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/ffiasm/-/ffiasm-0.1.1.tgz",
"integrity": "sha512-irMMHiR9JJ7BVBrAhtliUawxVdPYSdyl81taUYJ4C1mJ0iw2ueThE/qtr0J8B83tsIY8HJvh0lg5F+6ClK4xpA==",
"requires": { "requires": {
"big-integer": "^1.6.48", "big-integer": "^1.6.48",
"ejs": "^3.0.1", "ejs": "^3.0.1",
@ -581,13 +581,24 @@
} }
}, },
"ffjavascript": { "ffjavascript": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.2.4.tgz",
"integrity": "sha512-XFeWcjUDFPavN+DDOxhE8p5MOhZQJc9oO1Sj4ml1pyjqNhS1ujEamcjFyK0cctdnat61i7lvpTYzdtS3RYDC8w==",
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.2.10.tgz",
"integrity": "sha512-GQI6gHYYG5/iD4Kt3VzezzK7fARJzP0zkc82V/+JAdjfeKBXhDSo5rpKFuK3cDcrdW0Fu2emuYNMEAuFqhEQvQ==",
"requires": { "requires": {
"big-integer": "^1.6.48", "big-integer": "^1.6.48",
"wasmcurves": "0.0.4",
"wasmcurves": "0.0.5",
"worker-threads": "^1.0.0" "worker-threads": "^1.0.0"
},
"dependencies": {
"wasmcurves": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/wasmcurves/-/wasmcurves-0.0.5.tgz",
"integrity": "sha512-BmI4GXLjLawGg2YkvHa8zRsnWec+d1uwoxE+Iov8cqOpDL7GA5XO2pk2yuDbXHMzwIug2exnKot3baRZ86R0pA==",
"requires": {
"big-integer": "^1.6.42",
"blakejs": "^1.1.0"
}
}
} }
}, },
"ffwasm": { "ffwasm": {
@ -1163,6 +1174,16 @@
"version": "0.0.7", "version": "0.0.7",
"resolved": "https://registry.npmjs.org/fastfile/-/fastfile-0.0.7.tgz", "resolved": "https://registry.npmjs.org/fastfile/-/fastfile-0.0.7.tgz",
"integrity": "sha512-Zk7sdqsV6DsN/rhjULDfCCowPiMDsziTMFicdkrKN80yybr/6YFf9H91ELXN85dVEf6EYkVR5EHkZNc0dMqZKA==" "integrity": "sha512-Zk7sdqsV6DsN/rhjULDfCCowPiMDsziTMFicdkrKN80yybr/6YFf9H91ELXN85dVEf6EYkVR5EHkZNc0dMqZKA=="
},
"ffjavascript": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.2.4.tgz",
"integrity": "sha512-XFeWcjUDFPavN+DDOxhE8p5MOhZQJc9oO1Sj4ml1pyjqNhS1ujEamcjFyK0cctdnat61i7lvpTYzdtS3RYDC8w==",
"requires": {
"big-integer": "^1.6.48",
"wasmcurves": "0.0.4",
"worker-threads": "^1.0.0"
}
} }
} }
}, },

+ 3
- 3
package.json
View File

@ -30,10 +30,10 @@
}, },
"dependencies": { "dependencies": {
"chai": "^4.2.0", "chai": "^4.2.0",
"circom_runtime": "0.1.2",
"circom_runtime": "0.1.4",
"fastfile": "0.0.12", "fastfile": "0.0.12",
"ffiasm": "0.1.0",
"ffjavascript": "0.2.4",
"ffiasm": "0.1.1",
"ffjavascript": "0.2.10",
"ffwasm": "0.0.7", "ffwasm": "0.0.7",
"fnv-plus": "^1.3.1", "fnv-plus": "^1.3.1",
"r1csfile": "0.0.14", "r1csfile": "0.0.14",

+ 6
- 0
ports/c/builder.js
View File

@ -95,6 +95,10 @@ class CodeBuilderC {
this.ops.push({op: "CHECKCONSTRAINT", a, b, strErr}); this.ops.push({op: "CHECKCONSTRAINT", a, b, strErr});
} }
checkAssert(a, strErr) {
this.ops.push({op: "CHECKASSERT", a, strErr});
}
log(val) { log(val) {
this.ops.push({op: "LOG", val}); this.ops.push({op: "LOG", val});
} }
@ -215,6 +219,8 @@ class CodeBuilderC {
code.push(`${o.fnName}(ctx, ${o.retLabel}, ${o.params.join(",")});`); code.push(`${o.fnName}(ctx, ${o.retLabel}, ${o.params.join(",")});`);
} else if (o.op == "CHECKCONSTRAINT") { } else if (o.op == "CHECKCONSTRAINT") {
code.push(`ctx->checkConstraint(__cIdx, ${ref2src(o.a)}, ${ref2src(o.b)}, "${o.strErr}");`); code.push(`ctx->checkConstraint(__cIdx, ${ref2src(o.a)}, ${ref2src(o.b)}, "${o.strErr}");`);
} else if (o.op == "CHECKASSERT") {
code.push(`ctx->checkAssert(__cIdx, ${ref2src(o.a)}, "${o.strErr}");`);
} else if (o.op == "LOG") { } else if (o.op == "LOG") {
code.push(`ctx->log(${ref2src(o.val)});`); code.push(`ctx->log(${ref2src(o.val)});`);
} }

+ 30
- 0
ports/wasm/build_runtime.js
View File

@ -619,6 +619,35 @@ module.exports = function buildRuntime(module, builder) {
)); ));
} }
function buildCheckAssert() {
const f = module.addFunction("checkAssert");
f.addParam("cIdx", "i32");
f.addParam("pA", "i32");
f.addParam("pStr", "i32");
const c = f.getCodeBuilder();
f.addCode(ifSanityCheck(c,
c.if (
c.i32_eqz(
c.call(
"Fr_isTrue",
c.getLocal("pA"),
)
),
c.call(
"error",
c.i32_const(errs.ASSERT_DOES_NOT_MATCH.code),
c.i32_const(errs.ASSERT_DOES_NOT_MATCH.pointer),
c.getLocal("cIdx"),
c.getLocal("pA"),
c.getLocal("pStr"),
c.i32_const(0)
)
)
));
}
function buildGetNVars() { function buildGetNVars() {
const f = module.addFunction("getNVars"); const f = module.addFunction("getNVars");
f.setReturnType("i32"); f.setReturnType("i32");
@ -823,6 +852,7 @@ module.exports = function buildRuntime(module, builder) {
buildComponentFinished(); buildComponentFinished();
buildCheckConstraint(); buildCheckConstraint();
buildCheckAssert();
buildGetNVars(); buildGetNVars();
buildGetFrLen(); buildGetFrLen();

+ 12
- 0
ports/wasm/builder.js
View File

@ -98,6 +98,9 @@ class CodeBuilderWasm {
this.ops.push({op: "CHECKCONSTRAINT", a, b, strErr}); this.ops.push({op: "CHECKCONSTRAINT", a, b, strErr});
} }
checkAssert(a, strErr) {
this.ops.push({op: "CHECKASSERT", a, strErr});
}
concat(cb) { concat(cb) {
this.ops.push(...cb.ops); this.ops.push(...cb.ops);
@ -332,6 +335,15 @@ class CodeBuilderWasm {
c.i32_const(this.fnBuilder.builder.module.allocString(o.strErr)) c.i32_const(this.fnBuilder.builder.module.allocString(o.strErr))
) )
); );
} else if (o.op == "CHECKASSERT") {
code.push(
c.call(
"checkAssert",
c.getLocal("cIdx"),
this.fnBuilder._deRefFr(c, o.a),
c.i32_const(this.fnBuilder.builder.module.allocString(o.strErr))
)
);
} else if (o.op == "LOG") { } else if (o.op == "LOG") {
code.push( code.push(
c.call( c.call(

+ 1
- 0
ports/wasm/errs.js
View File

@ -7,4 +7,5 @@ module.exports = {
SIGNAL_ASSIGNED_TWICE: {code: 6, str: "Signal assigned twice"}, SIGNAL_ASSIGNED_TWICE: {code: 6, str: "Signal assigned twice"},
CONSTRAIN_DOES_NOT_MATCH: {code: 7, str: "Constraint doesn't match"}, CONSTRAIN_DOES_NOT_MATCH: {code: 7, str: "Constraint doesn't match"},
MAPISINPUT_DONT_MATCH: {code: 8, str: "MapIsInput don't match"}, MAPISINPUT_DONT_MATCH: {code: 8, str: "MapIsInput don't match"},
ASSERT_DOES_NOT_MATCH: {code: 9, str: "Assert not satisfied"},
}; };

+ 5
- 1
src/construction_phase.js
View File

@ -567,9 +567,13 @@ function execFunctionCall(ctx, ast) {
return; return;
} }
if (ast.name == "assert") { if (ast.name == "assert") {
ast.fileName = ctx.fileName;
ast.filePath = ctx.filePath;
const v = exec(ctx, ast.params[0]); const v = exec(ctx, ast.params[0]);
const ev = val(ctx, v, ast); const ev = val(ctx, v, ast);
if (ctx.F.isZero(ev)) return ctx.throwError(ast, "Assertion failed");
if ((typeof ev.v !== "undefined")&&(ctx.F.isZero(ev.v))) return ctx.throwError(ast, "Assertion failed");
return;
} }
const fnc = ctx.functions[ast.name]; const fnc = ctx.functions[ast.name];

+ 6
- 0
src/gencode.js
View File

@ -871,6 +871,12 @@ function genFunctionCall(ctx, ast) {
ctx.codeBuilder.log(toRefA_Fr1(ctx, ast.params[0], vRef)); ctx.codeBuilder.log(toRefA_Fr1(ctx, ast.params[0], vRef));
return vRef; return vRef;
} }
if (ast.name == "assert") {
const strErr = ast.fileName + ":" + ast.first_line + ":" + ast.first_column;
const vRef = gen(ctx, ast.params[0]);
ctx.codeBuilder.checkAssert(toRefA_Fr1(ctx, ast.params[0], vRef), strErr);
return vRef;
}
const params = []; const params = [];
for (let i=0; i<ast.params.length; i++) { for (let i=0; i<ast.params.length; i++) {
const pRef = gen(ctx, ast.params[i]); const pRef = gen(ctx, ast.params[i]);

Write Preview
Loading…
Cancel
Save