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

Mass rename Ebb and relatives to Block (#1365)

Browse Source 
* Manually rename BasicBlock to BlockPredecessor

BasicBlock is a pair of (Ebb, Inst) that is used to represent the
basic block subcomponent of an Ebb that is a predecessor to an Ebb.

Eventually we will be able to remove this struct, but for now it
makes sense to give it a non-conflicting name so that we can start
to transition Ebb to represent a basic block.

I have not updated any comments that refer to BasicBlock, as
eventually we will remove BlockPredecessor and replace with Block,
which is a basic block, so the comments will become correct.

* Manually rename SSABuilder block types to avoid conflict

SSABuilder has its own Block and BlockData types. These along with
associated identifier will cause conflicts in a later commit, so
they are renamed to be more verbose here.

* Automatically rename 'Ebb' to 'Block' in *.rs

* Automatically rename 'EBB' to 'block' in *.rs

* Automatically rename 'ebb' to 'block' in *.rs

* Automatically rename 'extended basic block' to 'basic block' in *.rs

* Automatically rename 'an basic block' to 'a basic block' in *.rs

* Manually update comment for `Block`

`Block`'s wikipedia article required an update.

* Automatically rename 'an `Block`' to 'a `Block`' in *.rs

* Automatically rename 'extended_basic_block' to 'basic_block' in *.rs

* Automatically rename 'ebb' to 'block' in *.clif

* Manually rename clif constant that contains 'ebb' as substring to avoid conflict

* Automatically rename filecheck uses of 'EBB' to 'BB'

'regex: EBB' -> 'regex: BB'
'$EBB' -> '$BB'

* Automatically rename 'EBB' 'Ebb' to 'block' in *.clif

* Automatically rename 'an block' to 'a block' in *.clif

* Fix broken testcase when function name length increases

Test function names are limited to 16 characters. This causes
the new longer name to be truncated and fail a filecheck test. An
outdated comment was also fixed.
This commit is contained in:
Ryan Hunt
2020-02-07 10:46:47 -06:00
committed by GitHub
parent a136d1cb00
commit 832666c45e
370 changed files with 8090 additions and 7988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cranelift/codegen/meta/src/shared/instructions.rs
View File

@@ -18,8 +18,8 @@ fn define_control_flow(
imm: &Immediates,
entities: &EntityRefs,
) {
let EBB = &Operand::new("EBB", &entities.ebb).with_doc("Destination extended basic block");
let args = &Operand::new("args", &entities.varargs).with_doc("EBB arguments");
let block = &Operand::new("block", &entities.block).with_doc("Destination basic block");
let args = &Operand::new("args", &entities.varargs).with_doc("block arguments");
ig.push(
Inst::new(
@@ -27,13 +27,13 @@ fn define_control_flow(
r#"
Jump.
Unconditionally jump to an extended basic block, passing the specified
EBB arguments. The number and types of arguments must match the
destination EBB.
Unconditionally jump to a basic block, passing the specified
block arguments. The number and types of arguments must match the
destination block.
"#,
&formats.jump,
)
.operands_in(vec![EBB, args])
.operands_in(vec![block, args])
.is_terminator(true)
.is_branch(true),
);
@@ -42,9 +42,9 @@ fn define_control_flow(
Inst::new(
"fallthrough",
r#"
Fall through to the next EBB.
Fall through to the next block.
This is the same as `jump`, except the destination EBB must be
This is the same as `jump`, except the destination block must be
the next one in the layout.
Jumps are turned into fall-through instructions by the branch
@@ -53,7 +53,7 @@ fn define_control_flow(
"#,
&formats.jump,
)
.operands_in(vec![EBB, args])
.operands_in(vec![block, args])
.is_terminator(true)
.is_branch(true),
);
@@ -81,7 +81,7 @@ fn define_control_flow(
"#,
&formats.branch,
)
.operands_in(vec![c, EBB, args])
.operands_in(vec![c, block, args])
.is_branch(true),
);
@@ -96,7 +96,7 @@ fn define_control_flow(
"#,
&formats.branch,
)
.operands_in(vec![c, EBB, args])
.operands_in(vec![c, block, args])
.is_branch(true),
);
}
@@ -124,14 +124,14 @@ fn define_control_flow(
and take the branch if the condition is true:
```text
br_icmp ugt v1, v2, ebb4(v5, v6)
br_icmp ugt v1, v2, block4(v5, v6)
```
is semantically equivalent to:
```text
v10 = icmp ugt, v1, v2
brnz v10, ebb4(v5, v6)
brnz v10, block4(v5, v6)
```
Some RISC architectures like MIPS and RISC-V provide instructions that
@@ -140,7 +140,7 @@ fn define_control_flow(
"#,
&formats.branch_icmp,
)
.operands_in(vec![Cond, x, y, EBB, args])
.operands_in(vec![Cond, x, y, block, args])
.is_branch(true),
);
@@ -154,7 +154,7 @@ fn define_control_flow(
"#,
&formats.branch_int,
)
.operands_in(vec![Cond, f, EBB, args])
.operands_in(vec![Cond, f, block, args])
.is_branch(true),
);
}
@@ -172,7 +172,7 @@ fn define_control_flow(
"#,
&formats.branch_float,
)
.operands_in(vec![Cond, f, EBB, args])
.operands_in(vec![Cond, f, block, args])
.is_branch(true),
);
}
@@ -188,8 +188,8 @@ fn define_control_flow(
Indirect branch via jump table.
Use ``x`` as an unsigned index into the jump table ``JT``. If a jump
table entry is found, branch to the corresponding EBB. If no entry was
found or the index is out-of-bounds, branch to the given default EBB.
table entry is found, branch to the corresponding block. If no entry was
found or the index is out-of-bounds, branch to the given default block.
Note that this branch instruction can't pass arguments to the targeted
blocks. Split critical edges as needed to work around this.
@@ -202,7 +202,7 @@ fn define_control_flow(
"#,
&formats.branch_table,
)
.operands_in(vec![x, EBB, JT])
.operands_in(vec![x, block, JT])
.is_terminator(true)
.is_branch(true),
);
@@ -1407,7 +1407,7 @@ pub(crate) fn define(
satisfy instruction constraints.
The register diversions created by this instruction must be undone
before the value leaves the EBB. At the entry to a new EBB, all live
before the value leaves the block. At the entry to a new block, all live
values must be in their originally assigned registers.
"#,
&formats.reg_move,