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

672
cranelift/tests/bugpoint_test.clif
View File

File diff suppressed because it is too large Load Diff

14
cranelift/tests/bugpoint_test_expected.clif
View File

@@ -2,7 +2,7 @@ function u0:0(i64, i64, i64) system_v {
sig0 = (i64, i64, i16, i64, i64, i64, i64, i64) system_v
fn0 = u0:95 sig0
ebb0(v0: i64, v1: i64, v2: i64):
block0(v0: i64, v1: i64, v2: i64):
v113 -> v1
v124 -> v1
v136 -> v1
@@ -17,7 +17,7 @@ ebb0(v0: i64, v1: i64, v2: i64):
v105 = iconst.i64 0
trap user0
ebb99(v804: i64, v1035: i64, v1037: i64, v1039: i64, v1044: i64, v1052: i16, v1057: i64):
block99(v804: i64, v1035: i64, v1037: i64, v1039: i64, v1044: i64, v1052: i16, v1057: i64):
v817 -> v1035
v830 -> v1037
v844 -> v1039
@@ -38,7 +38,7 @@ ebb99(v804: i64, v1035: i64, v1037: i64, v1039: i64, v1044: i64, v1052: i16, v10
v1060 -> v1057
trap user0
ebb101:
block101:
v829 = iconst.i64 0
v935 -> v829
v962 -> v829
@@ -47,7 +47,7 @@ ebb101:
v1049 -> v829
trap user0
ebb102:
block102:
v842 = iconst.i64 0
v976 -> v842
v989 -> v842
@@ -55,7 +55,7 @@ ebb102:
v1061 -> v842
trap user0
ebb105:
block105:
v883 = iconst.i64 0
v934 -> v883
v961 -> v883
@@ -64,12 +64,12 @@ ebb105:
v1048 -> v883
trap user0
ebb114:
block114:
v951 = iconst.i64 0
v988 -> v951
trap user0
ebb117:
block117:
v987 = iconst.i64 0
call fn0(v0, v105, v1052, v883, v829, v987, v951, v842)
trap user0