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

24
cranelift/filetests/filetests/regress/allow-relaxation-shrink.clif
View File

@@ -9,33 +9,33 @@ function u0:0(i64, i64) -> i64 system_v {
sig0 = (i64) -> i64 system_v
fn0 = u0:8 sig0
ebb0(v0: i64, v1: i64):
block0(v0: i64, v1: i64):
v3 = stack_addr.i64 ss1
v5 = call fn0(v1)
v6 = iconst.i64 0
v8 = iconst.i64 0
jump ebb3(v6, v1, v8)
jump block3(v6, v1, v8)
ebb3(v39: i64, v40: i64, v42: i64):
block3(v39: i64, v40: i64, v42: i64):
v9 = load.i64 v3
v11 = icmp_imm ugt v9, 1
v12 = bint.i8 v11
v13 = uextend.i32 v12
v14 = icmp_imm eq v13, 0
brnz v14, ebb4
jump ebb5
brnz v14, block4
jump block5
ebb4:
block4:
v18 = icmp_imm.i64 eq v40, 0
v19 = bint.i8 v18
v20 = uextend.i32 v19
brz v20, ebb6
jump ebb7
brz v20, block6
jump block7
ebb7:
block7:
trap user0
ebb5:
block5:
v22 = iconst.i32 1
v23 = ishl.i64 v39, v22
v25 = iconst.i64 1
@@ -47,9 +47,9 @@ ebb5:
v31 = iconst.i32 1
v32 = ushr v30, v31
store v32, v3
jump ebb3(v27, v40, v29)
jump block3(v27, v40, v29)
ebb6:
block6:
v38 = iconst.i64 0
return v38
}