mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 11:13:28 +01: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
278 lines
6.8 KiB
LLVM
278 lines
6.8 KiB
LLVM
; RUN: llvm-as < %s | llvm-dis | FileCheck %s
|
|
; RUN: verify-uselistorder %s
|
|
|
|
@addr = external global i64
|
|
|
|
define i64 @add_unsigned(i64 %x, i64 %y) {
|
|
; CHECK: %z = add nuw i64 %x, %y
|
|
%z = add nuw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @sub_unsigned(i64 %x, i64 %y) {
|
|
; CHECK: %z = sub nuw i64 %x, %y
|
|
%z = sub nuw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @mul_unsigned(i64 %x, i64 %y) {
|
|
; CHECK: %z = mul nuw i64 %x, %y
|
|
%z = mul nuw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @add_signed(i64 %x, i64 %y) {
|
|
; CHECK: %z = add nsw i64 %x, %y
|
|
%z = add nsw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @sub_signed(i64 %x, i64 %y) {
|
|
; CHECK: %z = sub nsw i64 %x, %y
|
|
%z = sub nsw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @mul_signed(i64 %x, i64 %y) {
|
|
; CHECK: %z = mul nsw i64 %x, %y
|
|
%z = mul nsw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @add_plain(i64 %x, i64 %y) {
|
|
; CHECK: %z = add i64 %x, %y
|
|
%z = add i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @sub_plain(i64 %x, i64 %y) {
|
|
; CHECK: %z = sub i64 %x, %y
|
|
%z = sub i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @mul_plain(i64 %x, i64 %y) {
|
|
; CHECK: %z = mul i64 %x, %y
|
|
%z = mul i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @add_both(i64 %x, i64 %y) {
|
|
; CHECK: %z = add nuw nsw i64 %x, %y
|
|
%z = add nuw nsw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @sub_both(i64 %x, i64 %y) {
|
|
; CHECK: %z = sub nuw nsw i64 %x, %y
|
|
%z = sub nuw nsw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @mul_both(i64 %x, i64 %y) {
|
|
; CHECK: %z = mul nuw nsw i64 %x, %y
|
|
%z = mul nuw nsw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @add_both_reversed(i64 %x, i64 %y) {
|
|
; CHECK: %z = add nuw nsw i64 %x, %y
|
|
%z = add nsw nuw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @sub_both_reversed(i64 %x, i64 %y) {
|
|
; CHECK: %z = sub nuw nsw i64 %x, %y
|
|
%z = sub nsw nuw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @mul_both_reversed(i64 %x, i64 %y) {
|
|
; CHECK: %z = mul nuw nsw i64 %x, %y
|
|
%z = mul nsw nuw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @shl_both(i64 %x, i64 %y) {
|
|
; CHECK: %z = shl nuw nsw i64 %x, %y
|
|
%z = shl nuw nsw i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @sdiv_exact(i64 %x, i64 %y) {
|
|
; CHECK: %z = sdiv exact i64 %x, %y
|
|
%z = sdiv exact i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @sdiv_plain(i64 %x, i64 %y) {
|
|
; CHECK: %z = sdiv i64 %x, %y
|
|
%z = sdiv i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @udiv_exact(i64 %x, i64 %y) {
|
|
; CHECK: %z = udiv exact i64 %x, %y
|
|
%z = udiv exact i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @udiv_plain(i64 %x, i64 %y) {
|
|
; CHECK: %z = udiv i64 %x, %y
|
|
%z = udiv i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @ashr_plain(i64 %x, i64 %y) {
|
|
; CHECK: %z = ashr i64 %x, %y
|
|
%z = ashr i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @ashr_exact(i64 %x, i64 %y) {
|
|
; CHECK: %z = ashr exact i64 %x, %y
|
|
%z = ashr exact i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @lshr_plain(i64 %x, i64 %y) {
|
|
; CHECK: %z = lshr i64 %x, %y
|
|
%z = lshr i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64 @lshr_exact(i64 %x, i64 %y) {
|
|
; CHECK: %z = lshr exact i64 %x, %y
|
|
%z = lshr exact i64 %x, %y
|
|
ret i64 %z
|
|
}
|
|
|
|
define i64* @gep_nw(i64* %p, i64 %x) {
|
|
; CHECK: %z = getelementptr inbounds i64, i64* %p, i64 %x
|
|
%z = getelementptr inbounds i64, i64* %p, i64 %x
|
|
ret i64* %z
|
|
}
|
|
|
|
define i64* @gep_plain(i64* %p, i64 %x) {
|
|
; CHECK: %z = getelementptr i64, i64* %p, i64 %x
|
|
%z = getelementptr i64, i64* %p, i64 %x
|
|
ret i64* %z
|
|
}
|
|
|
|
define i64 @add_both_ce() {
|
|
; CHECK: ret i64 add nuw nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 add nsw nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @sub_both_ce() {
|
|
; CHECK: ret i64 sub nuw nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 sub nsw nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @mul_both_ce() {
|
|
; CHECK: ret i64 mul nuw nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 mul nuw nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @sdiv_exact_ce() {
|
|
; CHECK: ret i64 sdiv exact (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 sdiv exact (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @udiv_exact_ce() {
|
|
; CHECK: ret i64 udiv exact (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 udiv exact (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @ashr_exact_ce() {
|
|
; CHECK: ret i64 ashr exact (i64 ptrtoint (i64* @addr to i64), i64 9)
|
|
ret i64 ashr exact (i64 ptrtoint (i64* @addr to i64), i64 9)
|
|
}
|
|
|
|
define i64 @lshr_exact_ce() {
|
|
; CHECK: ret i64 lshr exact (i64 ptrtoint (i64* @addr to i64), i64 9)
|
|
ret i64 lshr exact (i64 ptrtoint (i64* @addr to i64), i64 9)
|
|
}
|
|
|
|
define i64* @gep_nw_ce() {
|
|
; CHECK: ret i64* getelementptr inbounds (i64* @addr, i64 171)
|
|
ret i64* getelementptr inbounds (i64* @addr, i64 171)
|
|
}
|
|
|
|
define i64 @add_plain_ce() {
|
|
; CHECK: ret i64 add (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 add (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @sub_plain_ce() {
|
|
; CHECK: ret i64 sub (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 sub (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @mul_plain_ce() {
|
|
; CHECK: ret i64 mul (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 mul (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @sdiv_plain_ce() {
|
|
; CHECK: ret i64 sdiv (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 sdiv (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64* @gep_plain_ce() {
|
|
; CHECK: ret i64* getelementptr (i64* @addr, i64 171)
|
|
ret i64* getelementptr (i64* @addr, i64 171)
|
|
}
|
|
|
|
define i64 @add_both_reversed_ce() {
|
|
; CHECK: ret i64 add nuw nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 add nsw nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @sub_both_reversed_ce() {
|
|
; CHECK: ret i64 sub nuw nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 sub nsw nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @mul_both_reversed_ce() {
|
|
; CHECK: ret i64 mul nuw nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 mul nsw nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @add_signed_ce() {
|
|
; CHECK: ret i64 add nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 add nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @sub_signed_ce() {
|
|
; CHECK: ret i64 sub nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 sub nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @mul_signed_ce() {
|
|
; CHECK: ret i64 mul nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 mul nsw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @shl_signed_ce() {
|
|
; CHECK: ret i64 shl nsw (i64 ptrtoint (i64* @addr to i64), i64 17)
|
|
ret i64 shl nsw (i64 ptrtoint (i64* @addr to i64), i64 17)
|
|
}
|
|
|
|
|
|
define i64 @add_unsigned_ce() {
|
|
; CHECK: ret i64 add nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 add nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @sub_unsigned_ce() {
|
|
; CHECK: ret i64 sub nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 sub nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|
|
define i64 @mul_unsigned_ce() {
|
|
; CHECK: ret i64 mul nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
ret i64 mul nuw (i64 ptrtoint (i64* @addr to i64), i64 91)
|
|
}
|
|
|