T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISLE: Always default the priority to 0 (#4983)

Browse Source 
* Always default priorities to 0 in the ISLE IR
* Fix a hidden overlap in the x64 backend
This commit is contained in:
Trevor Elliott
2022-09-29 15:32:29 -07:00
committed by GitHub
parent 7d5b2b5bb2
commit 46e42601eb
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cranelift/codegen/src/isa/x64/lower.isle
View File

@@ -866,28 +866,28 @@
;; `i64` and smaller. ;; `i64` and smaller.
;; Multiply two registers. ;; Multiply two registers.
(rule -4 (lower (has_type (fits_in_64 ty) (imul x y))) (rule -5 (lower (has_type (fits_in_64 ty) (imul x y)))
(x64_mul ty x y)) (x64_mul ty x y))
;; Multiply a register and an immediate. ;; Multiply a register and an immediate.
(rule -2 (lower (has_type (fits_in_64 ty) (rule -3 (lower (has_type (fits_in_64 ty)
(imul x (simm32_from_value y)))) (imul x (simm32_from_value y))))
(x64_mul ty x y)) (x64_mul ty x y))
(rule -3 (lower (has_type (fits_in_64 ty) (rule -4 (lower (has_type (fits_in_64 ty)
(imul (simm32_from_value x) y))) (imul (simm32_from_value x) y)))
(x64_mul ty y x)) (x64_mul ty y x))
;; Multiply a register and a memory load. ;; Multiply a register and a memory load.
(rule -1 (lower (has_type (fits_in_64 ty) (rule -2 (lower (has_type (fits_in_64 ty)
(imul x (sinkable_load y)))) (imul x (sinkable_load y))))
(x64_mul ty (x64_mul ty
x x
(sink_load_to_gpr_mem_imm y))) (sink_load_to_gpr_mem_imm y)))
(rule 0 (lower (has_type (fits_in_64 ty) (rule -1 (lower (has_type (fits_in_64 ty)
(imul (sinkable_load x) y))) (imul (sinkable_load x) y)))
(x64_mul ty y (x64_mul ty y
(sink_load_to_gpr_mem_imm x))) (sink_load_to_gpr_mem_imm x)))

6
cranelift/isle/isle/src/sema.rs
View File

@@ -431,8 +431,8 @@ pub struct Rule {
/// The right-hand side expression that this rule evaluates upon successful /// The right-hand side expression that this rule evaluates upon successful
/// match. /// match.
pub rhs: Expr, pub rhs: Expr,
/// The priority of this rule, if any. /// The priority of this rule, defaulted to 0 if it was missing in the source.
pub prio: Option<i64>, pub prio: i64,
/// The source position where this rule is defined. /// The source position where this rule is defined.
pub pos: Pos, pub pos: Pos,
} }
@@ -1394,7 +1394,7 @@ impl TermEnv {
lhs, lhs,
iflets, iflets,
rhs, rhs,
prio: rule.prio, prio: rule.prio.unwrap_or(0),
pos, pos,
}); });
} }

2
cranelift/isle/isle/src/trie.rs
View File

@@ -337,7 +337,7 @@ impl<'a> TermFunctionsBuilder<'a> {
fn build(&mut self) { fn build(&mut self) {
for rule in 0..self.termenv.rules.len() { for rule in 0..self.termenv.rules.len() {
let rule = RuleId(rule); let rule = RuleId(rule);
let prio = self.termenv.rules[rule.index()].prio.unwrap_or(0); let prio = self.termenv.rules[rule.index()].prio;
let (pattern, expr) = lower_rule(self.typeenv, self.termenv, rule); let (pattern, expr) = lower_rule(self.typeenv, self.termenv, rule);
let root_term = self.termenv.rules[rule.index()].lhs.root_term().unwrap(); let root_term = self.termenv.rules[rule.index()].lhs.root_term().unwrap();