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

14
cranelift/filetests/filetests/wasm/r32.clif
View File

@@ -7,11 +7,11 @@ set enable_safepoints=true
target i686 haswell
function %select_ref(i32, r32, r32) -> r32 {
ebb0(v0: i32, v1: r32, v2: r32):
brz v0, ebb1(v2)
jump ebb1(v1)
block0(v0: i32, v1: r32, v2: r32):
brz v0, block1(v2)
jump block1(v1)
ebb1(v3: r32):
block1(v3: r32):
return v3
}
@@ -21,7 +21,7 @@ function %table_set(i32, r32, i32 vmctx) {
gv2 = load.i32 notrap aligned gv0 +4
table0 = dynamic gv1, element_size 1, bound gv2, index_type i32
ebb0(v0: i32, v1: r32, v2: i32):
block0(v0: i32, v1: r32, v2: i32):
v3 = table_addr.i32 table0, v0, +0;
store.r32 notrap aligned v1, v3
return
@@ -33,7 +33,7 @@ function %table_get(i32, i32 vmctx) -> r32 {
gv2 = load.i32 notrap aligned gv0 +4
table0 = dynamic gv1, element_size 1, bound gv2, index_type i32
ebb0(v0: i32, v1: i32):
block0(v0: i32, v1: i32):
v2 = table_addr.i32 table0, v0, +0;
v3 = load.r32 notrap aligned v2
return v3
@@ -44,7 +44,7 @@ function %test_refs(r32, r32, r32, i32 vmctx) {
fn1 = %table_set(i32, r32, i32 vmctx)
fn2 = %table_get(i32, i32 vmctx) -> r32
ebb0(v0: r32, v1: r32, v2: r32, v3: i32):
block0(v0: r32, v1: r32, v2: r32, v3: i32):
v4 = iconst.i32 0
v5 = iconst.i32 1
v8 = iconst.i32 2