ewilliams28/releases
1
0
Fork 0
mirror of https://github.com/open-policy-agent/opa.git synced 2026-08-12 19:32:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

wasm: replace comparison special cases, add and use builtins (#3271)

Browse Source 
The planner has further uses for ir.EqualStmt and ir.NotEqualStmt,
so they're not removed.

Signed-off-by: Stephan Renatus <stephan.renatus@gmail.com>
This commit is contained in:
Stephan Renatus
2021-03-15 20:03:32 +01:00
committed by GitHub
parent c80fb0446b
commit 8f7185db8a
8 changed files with 140 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/compiler/wasm/opa/callgraph.csv
+12
View File
@@ -188,6 +188,18 @@ parse_ip,memchr
opa_cidr_intersects,opa_value_type
opa_cidr_intersects,parse_cidr
opa_cidr_intersects,opa_boolean
opa_cmp_eq,opa_value_compare
opa_cmp_eq,opa_boolean
opa_cmp_neq,opa_value_compare
opa_cmp_neq,opa_boolean
opa_cmp_gt,opa_value_compare
opa_cmp_gt,opa_boolean
opa_cmp_gte,opa_value_compare
opa_cmp_gte,opa_boolean
opa_cmp_lt,opa_value_compare
opa_cmp_lt,opa_boolean
opa_cmp_lte,opa_value_compare
opa_cmp_lte,opa_boolean
opa_eval_ctx_new,opa_malloc
__force_import_opa_builtins,opa_builtin0
__force_import_opa_builtins,opa_builtin1
1 opa_agg_count opa_value_type
188 opa_cidr_intersects opa_value_type
189 opa_cidr_intersects parse_cidr
190 opa_cidr_intersects opa_boolean
191 opa_cmp_eq opa_value_compare
192 opa_cmp_eq opa_boolean
193 opa_cmp_neq opa_value_compare
194 opa_cmp_neq opa_boolean
195 opa_cmp_gt opa_value_compare
196 opa_cmp_gt opa_boolean
197 opa_cmp_gte opa_value_compare
198 opa_cmp_gte opa_boolean
199 opa_cmp_lt opa_value_compare
200 opa_cmp_lt opa_boolean
201 opa_cmp_lte opa_value_compare
202 opa_cmp_lte opa_boolean
203 opa_eval_ctx_new opa_malloc
204 __force_import_opa_builtins opa_builtin0
205 __force_import_opa_builtins opa_builtin1
internal/compiler/wasm/wasm.go
+6 -28
View File
@@ -126,6 +126,12 @@ var builtinsFunctions = map[string]string{
ast.NetCIDRContains.Name: "opa_cidr_contains",
ast.NetCIDROverlap.Name: "opa_cidr_contains",
ast.NetCIDRIntersects.Name: "opa_cidr_intersects",
ast.Equal.Name: "opa_cmp_eq",
ast.GreaterThan.Name: "opa_cmp_gt",
ast.GreaterThanEq.Name: "opa_cmp_gte",
ast.LessThan.Name: "opa_cmp_lt",
ast.LessThanEq.Name: "opa_cmp_lte",
ast.NotEqual.Name: "opa_cmp_neq",
ast.GlobMatch.Name: "opa_glob_match",
ast.JSONMarshal.Name: "opa_json_marshal",
ast.JSONUnmarshal.Name: "opa_json_unmarshal",
@@ -1017,34 +1023,6 @@ func (c *Compiler) compileBlock(block *ir.Block) ([]instruction.Instruction, err
instrs = append(instrs, instruction.Call{Index: c.function(opaValueCompare)})
instrs = append(instrs, instruction.BrIf{Index: 0})
}
case *ir.LessThanStmt:
instrs = append(instrs, c.instrRead(stmt.A))
instrs = append(instrs, c.instrRead(stmt.B))
instrs = append(instrs, instruction.Call{Index: c.function(opaValueCompare)})
instrs = append(instrs, instruction.I32Const{Value: 0})
instrs = append(instrs, instruction.I32GeS{})
instrs = append(instrs, instruction.BrIf{Index: 0})
case *ir.LessThanEqualStmt:
instrs = append(instrs, c.instrRead(stmt.A))
instrs = append(instrs, c.instrRead(stmt.B))
instrs = append(instrs, instruction.Call{Index: c.function(opaValueCompare)})
instrs = append(instrs, instruction.I32Const{Value: 0})
instrs = append(instrs, instruction.I32GtS{})
instrs = append(instrs, instruction.BrIf{Index: 0})
case *ir.GreaterThanStmt:
instrs = append(instrs, c.instrRead(stmt.A))
instrs = append(instrs, c.instrRead(stmt.B))
instrs = append(instrs, instruction.Call{Index: c.function(opaValueCompare)})
instrs = append(instrs, instruction.I32Const{Value: 0})
instrs = append(instrs, instruction.I32LeS{})
instrs = append(instrs, instruction.BrIf{Index: 0})
case *ir.GreaterThanEqualStmt:
instrs = append(instrs, c.instrRead(stmt.A))
instrs = append(instrs, c.instrRead(stmt.B))
instrs = append(instrs, instruction.Call{Index: c.function(opaValueCompare)})
instrs = append(instrs, instruction.I32Const{Value: 0})
instrs = append(instrs, instruction.I32LtS{})
instrs = append(instrs, instruction.BrIf{Index: 0})
case *ir.NotEqualStmt:
if stmt.A == stmt.B { // same local, same bool constant, or same string constant
instrs = append(instrs, instruction.Br{Index: 0})
internal/ir/ir.go
-32
View File
@@ -356,38 +356,6 @@ type EqualStmt struct {
Location
}
// LessThanStmt represents a < check of two local variables.
type LessThanStmt struct {
A LocalOrConst
B LocalOrConst
Location
}
// LessThanEqualStmt represents a <= check of two local variables.
type LessThanEqualStmt struct {
A LocalOrConst
B LocalOrConst
Location
}
// GreaterThanStmt represents a > check of two local variables.
type GreaterThanStmt struct {
A LocalOrConst
B LocalOrConst
Location
}
// GreaterThanEqualStmt represents a >= check of two local variables.
type GreaterThanEqualStmt struct {
A LocalOrConst
B LocalOrConst
Location
}
// NotEqualStmt represents a != check of two local variables.
type NotEqualStmt struct {
A LocalOrConst
internal/planner/planner.go
+1 -48
View File
@@ -728,54 +728,7 @@ func (p *Planner) planExprCall(e *ast.Expr, iter planiter) error {
switch operator {
case ast.Equality.Name:
return p.planUnify(e.Operand(0), e.Operand(1), iter)
case ast.Equal.Name:
return p.planBinaryExpr(e, func(a, b ir.LocalOrConst) error {
p.appendStmt(&ir.EqualStmt{
A: a,
B: b,
})
return iter()
})
case ast.LessThan.Name:
return p.planBinaryExpr(e, func(a, b ir.LocalOrConst) error {
p.appendStmt(&ir.LessThanStmt{
A: a,
B: b,
})
return iter()
})
case ast.LessThanEq.Name:
return p.planBinaryExpr(e, func(a, b ir.LocalOrConst) error {
p.appendStmt(&ir.LessThanEqualStmt{
A: a,
B: b,
})
return iter()
})
case ast.GreaterThan.Name:
return p.planBinaryExpr(e, func(a, b ir.LocalOrConst) error {
p.appendStmt(&ir.GreaterThanStmt{
A: a,
B: b,
})
return iter()
})
case ast.GreaterThanEq.Name:
return p.planBinaryExpr(e, func(a, b ir.LocalOrConst) error {
p.appendStmt(&ir.GreaterThanEqualStmt{
A: a,
B: b,
})
return iter()
})
case ast.NotEqual.Name:
return p.planBinaryExpr(e, func(a, b ir.LocalOrConst) error {
p.appendStmt(&ir.NotEqualStmt{
A: a,
B: b,
})
return iter()
})
default:
var relation bool
internal/planner/planner_test.go
+9 -6
View File
@@ -463,8 +463,8 @@ p[1] {
}
`},
exps: map[ir.Stmt]string{
&ir.GreaterThanStmt{}: "module-0.rego:4:3: 1 > 2",
&ir.SetAddStmt{}: "module-0.rego:3:1: p[1]",
&ir.CallStmt{}: "module-0.rego:4:3: 1 > 2",
&ir.SetAddStmt{}: "module-0.rego:3:1: p[1]",
},
where: funcs,
},
@@ -511,9 +511,10 @@ a = { "a": "b" |
1 > 0
}`},
exps: map[ir.Stmt]string{
&ir.GreaterThanStmt{}: "module-0.rego:3:3: 1 > 0",
&ir.CallStmt{}: "module-0.rego:3:3: 1 > 0",
&ir.ObjectInsertOnceStmt{}: "module-0.rego:2:5: { \"a\": \"b\" |\n 1 > 0\n}",
},
where: funcs,
},
{
note: "array comprehension in policy",
@@ -524,9 +525,10 @@ a = [ "a" |
1 > 0
]`},
exps: map[ir.Stmt]string{
&ir.GreaterThanStmt{}: "module-0.rego:3:3: 1 > 0",
&ir.CallStmt{}: "module-0.rego:3:3: 1 > 0",
&ir.ArrayAppendStmt{}: "module-0.rego:2:5: [ \"a\" |\n 1 > 0\n]",
},
where: funcs,
},
{
note: "set comprehension in policy",
@@ -537,9 +539,10 @@ a = { "a" |
1 > 0
}`},
exps: map[ir.Stmt]string{
&ir.GreaterThanStmt{}: "module-0.rego:3:3: 1 > 0",
&ir.SetAddStmt{}: "module-0.rego:2:5: { \"a\" |\n 1 > 0\n}",
&ir.CallStmt{}: "module-0.rego:3:3: 1 > 0",
&ir.SetAddStmt{}: "module-0.rego:2:5: { \"a\" |\n 1 > 0\n}",
},
where: funcs,
},
{
note: "set in policy",
test/wasm/assets/018_builtins.yaml
+66
View File
@@ -1,4 +1,70 @@
cases:
- note: equal built-in (true)
query: equal(1,1,x)
want_result:
- x: true
- # NOTE: This is a property of the planner/compiler interaction, more so
# than it is a property of the builtin implementation. Therefore, we only
# assert it once for equal/true, equal/false; instead of duplicating all
# the other comparison test cases.
note: equal built-in (true, result not captured)
query: equal(1,1)
want_defined: true
- note: equal built-in (false)
query: equal(1,2,x)
want_result:
- x: false
- note: equal built-in (false, result not captured)
query: equal(1,2)
want_defined: false
- note: gt built-in (true)
query: gt(1,0,x)
want_result:
- x: true
- note: gt built-in (false)
query: gt(1,2,x)
want_result:
- x: false
- note: gte built-in (true)
query: gte(1,0,x)
want_result:
- x: true
- note: gte built-in (true, equal)
query: gte(1,1,x)
want_result:
- x: true
- note: gte built-in (false)
query: gte(1,2,x)
want_result:
- x: false
- note: lt built-in (true)
query: lt(0,1,x)
want_result:
- x: true
- note: lt built-in (false)
query: lt(2,1,x)
want_result:
- x: false
- note: lte built-in (true)
query: lte(0,1,x)
want_result:
- x: true
- note: lte built-in (true, equal)
query: lte(0,0,x)
want_result:
- x: true
- note: lte built-in (false)
query: lte(2,1,x)
want_result:
- x: false
- note: neq built-in (true)
query: neq(0,1,x)
want_result:
- x: true
- note: neq built-in (false)
query: neq(1,1,x)
want_result:
- x: false
- note: abs built-in
query: abs(-1,x)
want_result: [{'x': 1}]
wasm/src/comparisons.c
+38
View File
@@ -0,0 +1,38 @@
#include "value.h"
#include "comparisons.h"
OPA_BUILTIN
opa_value *opa_cmp_eq(opa_value *a, opa_value *b)
{
return opa_boolean(opa_value_compare(a, b) == 0);
}
OPA_BUILTIN
opa_value *opa_cmp_neq(opa_value *a, opa_value *b)
{
return opa_boolean(opa_value_compare(a, b) != 0);
}
OPA_BUILTIN
opa_value *opa_cmp_gt(opa_value *a, opa_value *b)
{
return opa_boolean(opa_value_compare(a, b) > 0);
}
OPA_BUILTIN
opa_value *opa_cmp_gte(opa_value *a, opa_value *b)
{
return opa_boolean(opa_value_compare(a, b) >= 0);
}
OPA_BUILTIN
opa_value *opa_cmp_lt(opa_value *a, opa_value *b)
{
return opa_boolean(opa_value_compare(a, b) < 0);
}
OPA_BUILTIN
opa_value *opa_cmp_lte(opa_value *a, opa_value *b)
{
return opa_boolean(opa_value_compare(a, b) <= 0);
}
wasm/src/comparisons.h
+8
View File
@@ -0,0 +1,8 @@
#include "value.h"
opa_value *opa_cmp_eq(opa_value *a, opa_value *b);
opa_value *opa_cmp_neq(opa_value *a, opa_value *b);
opa_value *opa_cmp_gt(opa_value *a, opa_value *b);
opa_value *opa_cmp_gte(opa_value *a, opa_value *b);
opa_value *opa_cmp_lt(opa_value *a, opa_value *b);
opa_value *opa_cmp_lte(opa_value *a, opa_value *b);