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

52
cranelift/filetests/filetests/licm/multiple-blocks.clif
View File

@@ -3,57 +3,57 @@ target riscv32
function %multiple_blocks(i32) -> i32 {
ebb0(v0: i32):
jump ebb1(v0)
block0(v0: i32):
jump block1(v0)
ebb1(v10: i32):
block1(v10: i32):
v11 = iconst.i32 1
v12 = iconst.i32 2
v13 = iadd v11, v12
brz v10, ebb4(v10)
jump ebb2
brz v10, block4(v10)
jump block2
ebb2:
block2:
v15 = isub v10, v11
brz v15, ebb5(v15)
jump ebb3
brz v15, block5(v15)
jump block3
ebb3:
block3:
v14 = isub v10, v11
jump ebb1(v14)
jump block1(v14)
ebb4(v20: i32):
block4(v20: i32):
return v20
ebb5(v30: i32):
block5(v30: i32):
v31 = iadd v11, v13
jump ebb1(v30)
jump block1(v30)
}
; sameln:function %multiple_blocks(i32) -> i32 {
; nextln: ebb0(v0: i32):
; nextln: block0(v0: i32):
; nextln: v11 = iconst.i32 1
; nextln: v12 = iconst.i32 2
; nextln: v13 = iadd v11, v12
; nextln: v31 = iadd v11, v13
; nextln: jump ebb1(v0)
; nextln: jump block1(v0)
; nextln:
; nextln: ebb1(v10: i32):
; nextln: brz v10, ebb4(v10)
; nextln: jump ebb2
; nextln: block1(v10: i32):
; nextln: brz v10, block4(v10)
; nextln: jump block2
; nextln:
; nextln: ebb2:
; nextln: block2:
; nextln: v15 = isub.i32 v10, v11
; nextln: brz v15, ebb5(v15)
; nextln: jump ebb3
; nextln: brz v15, block5(v15)
; nextln: jump block3
; nextln:
; nextln: ebb3:
; nextln: block3:
; nextln: v14 = isub.i32 v10, v11
; nextln: jump ebb1(v14)
; nextln: jump block1(v14)
; nextln:
; nextln: ebb4(v20: i32):
; nextln: block4(v20: i32):
; nextln: return v20
; nextln:
; nextln: ebb5(v30: i32):
; nextln: jump ebb1(v30)
; nextln: block5(v30: i32):
; nextln: jump block1(v30)
; nextln: }