mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-23 04:52:54 +02:00
0d99339102
One of several parallel first steps to remove the target type of pointers,
replacing them with a single opaque pointer type.
This adds an explicit type parameter to the gep instruction so that when the
first parameter becomes an opaque pointer type, the type to gep through is
still available to the instructions.
* This doesn't modify gep operators, only instructions (operators will be
handled separately)
* Textual IR changes only. Bitcode (including upgrade) and changing the
in-memory representation will be in separate changes.
* geps of vectors are transformed as:
getelementptr <4 x float*> %x, ...
->getelementptr float, <4 x float*> %x, ...
Then, once the opaque pointer type is introduced, this will ultimately look
like:
getelementptr float, <4 x ptr> %x
with the unambiguous interpretation that it is a vector of pointers to float.
* address spaces remain on the pointer, not the type:
getelementptr float addrspace(1)* %x
->getelementptr float, float addrspace(1)* %x
Then, eventually:
getelementptr float, ptr addrspace(1) %x
Importantly, the massive amount of test case churn has been automated by
same crappy python code. I had to manually update a few test cases that
wouldn't fit the script's model (r228970,r229196,r229197,r229198). The
python script just massages stdin and writes the result to stdout, I
then wrapped that in a shell script to handle replacing files, then
using the usual find+xargs to migrate all the files.
update.py:
import fileinput
import sys
import re
ibrep = re.compile(r"(^.*?[^%\w]getelementptr inbounds )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
normrep = re.compile( r"(^.*?[^%\w]getelementptr )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
def conv(match, line):
if not match:
return line
line = match.groups()[0]
if len(match.groups()[5]) == 0:
line += match.groups()[2]
line += match.groups()[3]
line += ", "
line += match.groups()[1]
line += "\n"
return line
for line in sys.stdin:
if line.find("getelementptr ") == line.find("getelementptr inbounds"):
if line.find("getelementptr inbounds") != line.find("getelementptr inbounds ("):
line = conv(re.match(ibrep, line), line)
elif line.find("getelementptr ") != line.find("getelementptr ("):
line = conv(re.match(normrep, line), line)
sys.stdout.write(line)
apply.sh:
for name in "$@"
do
python3 `dirname "$0"`/update.py < "$name" > "$name.tmp" && mv "$name.tmp" "$name"
rm -f "$name.tmp"
done
The actual commands:
From llvm/src:
find test/ -name *.ll | xargs ./apply.sh
From llvm/src/tools/clang:
find test/ -name *.mm -o -name *.m -o -name *.cpp -o -name *.c | xargs -I '{}' ../../apply.sh "{}"
From llvm/src/tools/polly:
find test/ -name *.ll | xargs ./apply.sh
After that, check-all (with llvm, clang, clang-tools-extra, lld,
compiler-rt, and polly all checked out).
The extra 'rm' in the apply.sh script is due to a few files in clang's test
suite using interesting unicode stuff that my python script was throwing
exceptions on. None of those files needed to be migrated, so it seemed
sufficient to ignore those cases.
Reviewers: rafael, dexonsmith, grosser
Differential Revision: http://reviews.llvm.org/D7636
llvm-svn: 230786
124 lines
4.6 KiB
LLVM
124 lines
4.6 KiB
LLVM
; RUN: opt -mtriple=x86_64-pc-windows-msvc -winehprepare -S -o - < %s | FileCheck %s
|
|
|
|
; This test is based on the following code:
|
|
;
|
|
; void test()
|
|
; {
|
|
; try {
|
|
; may_throw();
|
|
; } catch (int i) {
|
|
; handle_int(i);
|
|
; }
|
|
; }
|
|
;
|
|
; Parts of the IR have been hand-edited to simplify the test case.
|
|
; The full IR will be restored when Windows C++ EH support is complete.
|
|
|
|
;ModuleID = 'cppeh-catch-scalar.cpp'
|
|
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
|
|
target triple = "x86_64-pc-windows-msvc"
|
|
|
|
; This is the structure that will get created for the frame allocation.
|
|
; CHECK: %struct._Z4testv.ehdata = type { i32, i8*, i32 }
|
|
|
|
@_ZTIi = external constant i8*
|
|
|
|
; The function entry will be rewritten like this.
|
|
; CHECK: define void @_Z4testv() #0 {
|
|
; CHECK: entry:
|
|
; CHECK: %frame.alloc = call i8* @llvm.frameallocate(i32 24)
|
|
; CHECK: %eh.data = bitcast i8* %frame.alloc to %struct._Z4testv.ehdata*
|
|
; CHECK: %exn.slot = alloca i8*
|
|
; CHECK: %ehselector.slot = alloca i32
|
|
; CHECK-NOT: %i = alloca i32, align 4
|
|
; CHECK: %i = getelementptr inbounds %struct._Z4testv.ehdata, %struct._Z4testv.ehdata* %eh.data, i32 0, i32 2
|
|
|
|
; Function Attrs: uwtable
|
|
define void @_Z4testv() #0 {
|
|
entry:
|
|
%exn.slot = alloca i8*
|
|
%ehselector.slot = alloca i32
|
|
%i = alloca i32, align 4
|
|
invoke void @_Z9may_throwv()
|
|
to label %invoke.cont unwind label %lpad
|
|
|
|
invoke.cont: ; preds = %entry
|
|
br label %try.cont
|
|
|
|
lpad: ; preds = %entry
|
|
%0 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__CxxFrameHandler3 to i8*)
|
|
catch i8* bitcast (i8** @_ZTIi to i8*)
|
|
%1 = extractvalue { i8*, i32 } %0, 0
|
|
store i8* %1, i8** %exn.slot
|
|
%2 = extractvalue { i8*, i32 } %0, 1
|
|
store i32 %2, i32* %ehselector.slot
|
|
br label %catch.dispatch
|
|
|
|
catch.dispatch: ; preds = %lpad
|
|
%sel = load i32* %ehselector.slot
|
|
%3 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*)) #3
|
|
%matches = icmp eq i32 %sel, %3
|
|
br i1 %matches, label %catch, label %eh.resume
|
|
|
|
catch: ; preds = %catch.dispatch
|
|
%exn11 = load i8** %exn.slot
|
|
%4 = call i8* @llvm.eh.begincatch(i8* %exn11) #3
|
|
%5 = bitcast i8* %4 to i32*
|
|
%6 = load i32* %5, align 4
|
|
store i32 %6, i32* %i, align 4
|
|
%7 = load i32* %i, align 4
|
|
call void @_Z10handle_inti(i32 %7)
|
|
br label %invoke.cont2
|
|
|
|
invoke.cont2: ; preds = %catch
|
|
call void @llvm.eh.endcatch() #3
|
|
br label %try.cont
|
|
|
|
try.cont: ; preds = %invoke.cont2, %invoke.cont
|
|
ret void
|
|
|
|
eh.resume: ; preds = %catch.dispatch
|
|
%exn3 = load i8** %exn.slot
|
|
%sel4 = load i32* %ehselector.slot
|
|
%lpad.val = insertvalue { i8*, i32 } undef, i8* %exn3, 0
|
|
%lpad.val5 = insertvalue { i8*, i32 } %lpad.val, i32 %sel4, 1
|
|
resume { i8*, i32 } %lpad.val5
|
|
}
|
|
|
|
; CHECK: define i8* @_Z4testv.catch(i8*, i8*) {
|
|
; CHECK: catch.entry:
|
|
; CHECK: %eh.alloc = call i8* @llvm.framerecover(i8* bitcast (void ()* @_Z4testv to i8*), i8* %1)
|
|
; CHECK: %eh.data = bitcast i8* %eh.alloc to %struct._Z4testv.ehdata*
|
|
; CHECK: %eh.obj.ptr = getelementptr inbounds %struct._Z4testv.ehdata, %struct._Z4testv.ehdata* %eh.data, i32 0, i32 1
|
|
; CHECK: %eh.obj = load i8** %eh.obj.ptr
|
|
; CHECK: %i = getelementptr inbounds %struct._Z4testv.ehdata, %struct._Z4testv.ehdata* %eh.data, i32 0, i32 2
|
|
; CHECK: %2 = bitcast i8* %eh.obj to i32*
|
|
; CHECK: %3 = load i32* %2, align 4
|
|
; CHECK: store i32 %3, i32* %i, align 4
|
|
; CHECK: %4 = load i32* %i, align 4
|
|
; CHECK: call void @_Z10handle_inti(i32 %4)
|
|
; CHECK: ret i8* blockaddress(@_Z4testv, %try.cont)
|
|
; CHECK: }
|
|
|
|
declare void @_Z9may_throwv() #1
|
|
|
|
declare i32 @__CxxFrameHandler3(...)
|
|
|
|
; Function Attrs: nounwind readnone
|
|
declare i32 @llvm.eh.typeid.for(i8*) #2
|
|
|
|
declare i8* @llvm.eh.begincatch(i8*)
|
|
|
|
declare void @llvm.eh.endcatch()
|
|
|
|
declare void @_Z10handle_inti(i32) #1
|
|
|
|
attributes #0 = { uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
|
|
attributes #1 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
|
|
attributes #2 = { nounwind readnone }
|
|
attributes #3 = { nounwind }
|
|
|
|
!llvm.ident = !{!0}
|
|
|
|
!0 = !{!"clang version 3.7.0 (trunk 227474) (llvm/trunk 227508)"}
|