2016-09-09 05:40:21 +08:00
|
|
|
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
|
2013-08-22 03:53:10 +08:00
|
|
|
target datalayout = "e-p:64:64:64-p1:16:16:16-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
|
2009-11-04 16:05:20 +08:00
|
|
|
|
|
|
|
|
; Optimize subtracts.
|
2002-05-06 13:51:26 +08:00
|
|
|
;
|
2009-11-04 15:57:05 +08:00
|
|
|
; RUN: opt < %s -instcombine -S | FileCheck %s
|
2002-05-06 13:51:26 +08:00
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test1(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test1(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: ret i32 0
|
|
|
|
|
;
|
|
|
|
|
%B = sub i32 %A, %A
|
|
|
|
|
ret i32 %B
|
2002-05-06 13:51:26 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test2(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test2(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: ret i32 %A
|
|
|
|
|
;
|
|
|
|
|
%B = sub i32 %A, 0
|
|
|
|
|
ret i32 %B
|
2002-05-06 13:51:26 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test3(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test3(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: ret i32 %A
|
|
|
|
|
;
|
|
|
|
|
%B = sub i32 0, %A
|
|
|
|
|
%C = sub i32 0, %B
|
|
|
|
|
ret i32 %C
|
2002-05-07 00:19:16 +08:00
|
|
|
}
|
2002-05-09 07:15:01 +08:00
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test4(i32 %A, i32 %x) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test4(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[C:%.*]] = add i32 %x, %A
|
|
|
|
|
; CHECK-NEXT: ret i32 [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = sub i32 0, %A
|
|
|
|
|
%C = sub i32 %x, %B
|
|
|
|
|
ret i32 %C
|
2002-05-09 07:15:01 +08:00
|
|
|
}
|
|
|
|
|
|
2009-11-04 15:57:05 +08:00
|
|
|
define i32 @test5(i32 %A, i32 %B, i32 %C) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test5(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[D1:%.*]] = sub i32 %C, %B
|
|
|
|
|
; CHECK-NEXT: [[E:%.*]] = add i32 [[D1]], %A
|
|
|
|
|
; CHECK-NEXT: ret i32 [[E]]
|
|
|
|
|
;
|
|
|
|
|
%D = sub i32 %B, %C
|
|
|
|
|
%E = sub i32 %A, %D
|
|
|
|
|
ret i32 %E
|
2002-05-09 07:15:01 +08:00
|
|
|
}
|
2003-02-19 03:28:47 +08:00
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test6(i32 %A, i32 %B) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test6(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[B_NOT:%.*]] = xor i32 %B, -1
|
|
|
|
|
; CHECK-NEXT: [[D:%.*]] = and i32 %A, [[B_NOT]]
|
|
|
|
|
; CHECK-NEXT: ret i32 [[D]]
|
|
|
|
|
;
|
|
|
|
|
%C = and i32 %A, %B
|
|
|
|
|
%D = sub i32 %A, %C
|
|
|
|
|
ret i32 %D
|
2003-02-19 03:28:47 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test7(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test7(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[B:%.*]] = xor i32 %A, -1
|
|
|
|
|
; CHECK-NEXT: ret i32 [[B]]
|
|
|
|
|
;
|
|
|
|
|
%B = sub i32 -1, %A
|
|
|
|
|
ret i32 %B
|
2003-02-19 03:28:47 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test8(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test8(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[C:%.*]] = shl i32 %A, 3
|
|
|
|
|
; CHECK-NEXT: ret i32 [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = mul i32 9, %A
|
|
|
|
|
%C = sub i32 %B, %A
|
|
|
|
|
ret i32 %C
|
2003-02-19 03:55:31 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test9(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test9(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[C:%.*]] = mul i32 %A, -2
|
|
|
|
|
; CHECK-NEXT: ret i32 [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = mul i32 3, %A
|
|
|
|
|
%C = sub i32 %A, %B
|
|
|
|
|
ret i32 %C
|
2003-02-19 03:55:31 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test10(i32 %A, i32 %B) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test10(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[E:%.*]] = mul i32 %A, %B
|
|
|
|
|
; CHECK-NEXT: ret i32 [[E]]
|
|
|
|
|
;
|
|
|
|
|
%C = sub i32 0, %A
|
|
|
|
|
%D = sub i32 0, %B
|
|
|
|
|
%E = mul i32 %C, %D
|
|
|
|
|
ret i32 %E
|
2003-03-11 07:22:50 +08:00
|
|
|
}
|
|
|
|
|
|
2009-11-04 15:57:05 +08:00
|
|
|
define i32 @test10a(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test10a(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[E:%.*]] = mul i32 %A, -7
|
|
|
|
|
; CHECK-NEXT: ret i32 [[E]]
|
|
|
|
|
;
|
|
|
|
|
%C = sub i32 0, %A
|
|
|
|
|
%E = mul i32 %C, 7
|
|
|
|
|
ret i32 %E
|
2003-03-11 07:22:50 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i1 @test11(i8 %A, i8 %B) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test11(
|
2016-08-03 08:36:54 +08:00
|
|
|
; CHECK-NEXT: [[D:%.*]] = icmp ne i8 %A, %B
|
|
|
|
|
; CHECK-NEXT: ret i1 [[D]]
|
|
|
|
|
;
|
|
|
|
|
%C = sub i8 %A, %B
|
|
|
|
|
%D = icmp ne i8 %C, 0
|
|
|
|
|
ret i1 %D
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define <2 x i1> @test11vec(<2 x i8> %A, <2 x i8> %B) {
|
|
|
|
|
; CHECK-LABEL: @test11vec(
|
2016-08-04 02:59:03 +08:00
|
|
|
; CHECK-NEXT: [[D:%.*]] = icmp ne <2 x i8> %A, %B
|
2016-08-03 08:36:54 +08:00
|
|
|
; CHECK-NEXT: ret <2 x i1> [[D]]
|
|
|
|
|
;
|
|
|
|
|
%C = sub <2 x i8> %A, %B
|
|
|
|
|
%D = icmp ne <2 x i8> %C, zeroinitializer
|
|
|
|
|
ret <2 x i1> %D
|
2003-08-13 13:27:57 +08:00
|
|
|
}
|
2004-03-13 07:52:51 +08:00
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test12(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test12(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[C:%.*]] = lshr i32 %A, 31
|
|
|
|
|
; CHECK-NEXT: ret i32 [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = ashr i32 %A, 31
|
|
|
|
|
%C = sub i32 0, %B
|
|
|
|
|
ret i32 %C
|
2004-03-13 07:52:51 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test13(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test13(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[C:%.*]] = ashr i32 %A, 31
|
|
|
|
|
; CHECK-NEXT: ret i32 [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = lshr i32 %A, 31
|
|
|
|
|
%C = sub i32 0, %B
|
|
|
|
|
ret i32 %C
|
2004-03-13 07:52:51 +08:00
|
|
|
}
|
2004-03-13 08:11:38 +08:00
|
|
|
|
2016-10-14 23:55:34 +08:00
|
|
|
define <2 x i32> @test12vec(<2 x i32> %A) {
|
|
|
|
|
; CHECK-LABEL: @test12vec(
|
|
|
|
|
; CHECK-NEXT: [[B:%.*]] = ashr <2 x i32> %A, <i32 31, i32 31>
|
|
|
|
|
; CHECK-NEXT: [[C:%.*]] = sub nsw <2 x i32> zeroinitializer, [[B]]
|
|
|
|
|
; CHECK-NEXT: ret <2 x i32> [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = ashr <2 x i32> %A, <i32 31, i32 31>
|
|
|
|
|
%C = sub <2 x i32> zeroinitializer, %B
|
|
|
|
|
ret <2 x i32> %C
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define <2 x i32> @test13vec(<2 x i32> %A) {
|
|
|
|
|
; CHECK-LABEL: @test13vec(
|
|
|
|
|
; CHECK-NEXT: [[B:%.*]] = lshr <2 x i32> %A, <i32 31, i32 31>
|
|
|
|
|
; CHECK-NEXT: [[C:%.*]] = sub nsw <2 x i32> zeroinitializer, [[B]]
|
|
|
|
|
; CHECK-NEXT: ret <2 x i32> [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = lshr <2 x i32> %A, <i32 31, i32 31>
|
|
|
|
|
%C = sub <2 x i32> zeroinitializer, %B
|
|
|
|
|
ret <2 x i32> %C
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test15(i32 %A, i32 %B) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test15(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[C:%.*]] = sub i32 0, %A
|
|
|
|
|
; CHECK-NEXT: [[D:%.*]] = srem i32 %B, [[C]]
|
|
|
|
|
; CHECK-NEXT: ret i32 [[D]]
|
|
|
|
|
;
|
|
|
|
|
%C = sub i32 0, %A
|
|
|
|
|
%D = srem i32 %B, %C
|
|
|
|
|
ret i32 %D
|
2004-07-06 15:00:11 +08:00
|
|
|
}
|
2004-10-06 23:07:56 +08:00
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test16(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test16(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[Y:%.*]] = sdiv i32 %A, -1123
|
|
|
|
|
; CHECK-NEXT: ret i32 [[Y]]
|
|
|
|
|
;
|
|
|
|
|
%X = sdiv i32 %A, 1123
|
|
|
|
|
%Y = sub i32 0, %X
|
|
|
|
|
ret i32 %Y
|
2004-10-06 23:07:56 +08:00
|
|
|
}
|
2004-10-09 10:50:01 +08:00
|
|
|
|
2008-11-30 11:42:12 +08:00
|
|
|
; Can't fold subtract here because negation it might oveflow.
|
|
|
|
|
; PR3142
|
2009-11-04 15:57:05 +08:00
|
|
|
define i32 @test17(i32 %A) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test17(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[B:%.*]] = sub i32 0, %A
|
|
|
|
|
; CHECK-NEXT: [[C:%.*]] = sdiv i32 [[B]], 1234
|
|
|
|
|
; CHECK-NEXT: ret i32 [[C]]
|
|
|
|
|
;
|
|
|
|
|
%B = sub i32 0, %A
|
|
|
|
|
%C = sdiv i32 %B, 1234
|
|
|
|
|
ret i32 %C
|
2004-10-09 10:50:01 +08:00
|
|
|
}
|
2004-11-14 03:49:39 +08:00
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i64 @test18(i64 %Y) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test18(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: ret i64 0
|
|
|
|
|
;
|
|
|
|
|
%tmp.4 = shl i64 %Y, 2
|
|
|
|
|
%tmp.12 = shl i64 %Y, 2
|
|
|
|
|
%tmp.8 = sub i64 %tmp.4, %tmp.12
|
|
|
|
|
ret i64 %tmp.8
|
2004-11-14 03:49:39 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i32 @test19(i32 %X, i32 %Y) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test19(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: ret i32 %X
|
|
|
|
|
;
|
|
|
|
|
%Z = sub i32 %X, %Y
|
|
|
|
|
%Q = add i32 %Z, %Y
|
|
|
|
|
ret i32 %Q
|
2005-04-08 00:41:45 +08:00
|
|
|
}
|
2006-02-27 09:43:02 +08:00
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i1 @test20(i32 %g, i32 %h) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test20(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[TMP_4:%.*]] = icmp ne i32 %h, 0
|
|
|
|
|
; CHECK-NEXT: ret i1 [[TMP_4]]
|
|
|
|
|
;
|
|
|
|
|
%tmp.2 = sub i32 %g, %h
|
|
|
|
|
%tmp.4 = icmp ne i32 %tmp.2, %g
|
|
|
|
|
ret i1 %tmp.4
|
2006-02-27 09:43:02 +08:00
|
|
|
}
|
|
|
|
|
|
2008-03-01 17:15:35 +08:00
|
|
|
define i1 @test21(i32 %g, i32 %h) {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test21(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[TMP_4:%.*]] = icmp ne i32 %h, 0
|
|
|
|
|
; CHECK-NEXT: ret i1 [[TMP_4]]
|
|
|
|
|
;
|
|
|
|
|
%tmp.2 = sub i32 %g, %h
|
|
|
|
|
%tmp.4 = icmp ne i32 %tmp.2, %g
|
|
|
|
|
ret i1 %tmp.4
|
2006-02-27 09:43:02 +08:00
|
|
|
}
|
2008-05-09 13:19:28 +08:00
|
|
|
|
|
|
|
|
; PR2298
|
2011-06-17 11:14:27 +08:00
|
|
|
define zeroext i1 @test22(i32 %a, i32 %b) nounwind {
|
2013-07-14 09:42:54 +08:00
|
|
|
; CHECK-LABEL: @test22(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[TMP5:%.*]] = icmp eq i32 %b, %a
|
|
|
|
|
; CHECK-NEXT: ret i1 [[TMP5]]
|
|
|
|
|
;
|
|
|
|
|
%tmp2 = sub i32 0, %a
|
|
|
|
|
%tmp4 = sub i32 0, %b
|
|
|
|
|
%tmp5 = icmp eq i32 %tmp2, %tmp4
|
|
|
|
|
ret i1 %tmp5
|
2008-05-09 13:19:28 +08:00
|
|
|
}
|
|
|
|
|
|
2009-11-04 16:05:20 +08:00
|
|
|
; rdar://7362831
|
|
|
|
|
define i32 @test23(i8* %P, i64 %A){
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test23(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = trunc i64 %A to i32
|
|
|
|
|
; CHECK-NEXT: ret i32 [[TMP1]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds i8, i8* %P, i64 %A
|
2009-11-04 16:05:20 +08:00
|
|
|
%C = ptrtoint i8* %B to i64
|
|
|
|
|
%D = trunc i64 %C to i32
|
|
|
|
|
%E = ptrtoint i8* %P to i64
|
|
|
|
|
%F = trunc i64 %E to i32
|
|
|
|
|
%G = sub i32 %D, %F
|
|
|
|
|
ret i32 %G
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-22 03:53:10 +08:00
|
|
|
define i8 @test23_as1(i8 addrspace(1)* %P, i16 %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test23_as1(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = trunc i16 %A to i8
|
|
|
|
|
; CHECK-NEXT: ret i8 [[TMP1]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds i8, i8 addrspace(1)* %P, i16 %A
|
2013-08-22 03:53:10 +08:00
|
|
|
%C = ptrtoint i8 addrspace(1)* %B to i16
|
|
|
|
|
%D = trunc i16 %C to i8
|
|
|
|
|
%E = ptrtoint i8 addrspace(1)* %P to i16
|
|
|
|
|
%F = trunc i16 %E to i8
|
|
|
|
|
%G = sub i8 %D, %F
|
|
|
|
|
ret i8 %G
|
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 16:05:20 +08:00
|
|
|
define i64 @test24(i8* %P, i64 %A){
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test24(
|
|
|
|
|
; CHECK-NEXT: ret i64 %A
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds i8, i8* %P, i64 %A
|
2009-11-04 16:05:20 +08:00
|
|
|
%C = ptrtoint i8* %B to i64
|
|
|
|
|
%E = ptrtoint i8* %P to i64
|
|
|
|
|
%G = sub i64 %C, %E
|
|
|
|
|
ret i64 %G
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-22 03:53:10 +08:00
|
|
|
define i16 @test24_as1(i8 addrspace(1)* %P, i16 %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test24_as1(
|
|
|
|
|
; CHECK-NEXT: ret i16 %A
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds i8, i8 addrspace(1)* %P, i16 %A
|
2013-08-22 03:53:10 +08:00
|
|
|
%C = ptrtoint i8 addrspace(1)* %B to i16
|
|
|
|
|
%E = ptrtoint i8 addrspace(1)* %P to i16
|
|
|
|
|
%G = sub i16 %C, %E
|
|
|
|
|
ret i16 %G
|
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 16:05:20 +08:00
|
|
|
define i64 @test24a(i8* %P, i64 %A){
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test24a(
|
|
|
|
|
; CHECK-NEXT: [[DIFF_NEG:%.*]] = sub i64 0, %A
|
|
|
|
|
; CHECK-NEXT: ret i64 [[DIFF_NEG]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds i8, i8* %P, i64 %A
|
2009-11-04 16:05:20 +08:00
|
|
|
%C = ptrtoint i8* %B to i64
|
|
|
|
|
%E = ptrtoint i8* %P to i64
|
|
|
|
|
%G = sub i64 %E, %C
|
|
|
|
|
ret i64 %G
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-22 03:53:10 +08:00
|
|
|
define i16 @test24a_as1(i8 addrspace(1)* %P, i16 %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test24a_as1(
|
|
|
|
|
; CHECK-NEXT: [[DIFF_NEG:%.*]] = sub i16 0, %A
|
|
|
|
|
; CHECK-NEXT: ret i16 [[DIFF_NEG]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds i8, i8 addrspace(1)* %P, i16 %A
|
2013-08-22 03:53:10 +08:00
|
|
|
%C = ptrtoint i8 addrspace(1)* %B to i16
|
|
|
|
|
%E = ptrtoint i8 addrspace(1)* %P to i16
|
|
|
|
|
%G = sub i16 %E, %C
|
|
|
|
|
ret i16 %G
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-01-02 06:29:12 +08:00
|
|
|
@Arr = external global [42 x i16]
|
|
|
|
|
|
|
|
|
|
define i64 @test24b(i8* %P, i64 %A){
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test24b(
|
|
|
|
|
; CHECK-NEXT: [[B_IDX:%.*]] = shl nuw i64 %A, 1
|
|
|
|
|
; CHECK-NEXT: ret i64 [[B_IDX]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds [42 x i16], [42 x i16]* @Arr, i64 0, i64 %A
|
2010-01-02 06:29:12 +08:00
|
|
|
%C = ptrtoint i16* %B to i64
|
|
|
|
|
%G = sub i64 %C, ptrtoint ([42 x i16]* @Arr to i64)
|
|
|
|
|
ret i64 %G
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-02 06:42:29 +08:00
|
|
|
|
|
|
|
|
define i64 @test25(i8* %P, i64 %A){
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test25(
|
|
|
|
|
; CHECK-NEXT: [[B_IDX:%.*]] = shl nuw i64 %A, 1
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = add i64 [[B_IDX]], -84
|
|
|
|
|
; CHECK-NEXT: ret i64 [[TMP1]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds [42 x i16], [42 x i16]* @Arr, i64 0, i64 %A
|
2010-01-02 06:42:29 +08:00
|
|
|
%C = ptrtoint i16* %B to i64
|
2015-03-14 02:20:45 +08:00
|
|
|
%G = sub i64 %C, ptrtoint (i16* getelementptr ([42 x i16], [42 x i16]* @Arr, i64 1, i64 0) to i64)
|
2010-01-02 06:42:29 +08:00
|
|
|
ret i64 %G
|
2013-08-22 03:53:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Arr_as1 = external addrspace(1) global [42 x i16]
|
|
|
|
|
|
|
|
|
|
define i16 @test25_as1(i8 addrspace(1)* %P, i64 %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test25_as1(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = trunc i64 %A to i16
|
|
|
|
|
; CHECK-NEXT: [[B_IDX:%.*]] = shl nuw i16 [[TMP1]], 1
|
|
|
|
|
; CHECK-NEXT: [[TMP2:%.*]] = add i16 [[B_IDX]], -84
|
|
|
|
|
; CHECK-NEXT: ret i16 [[TMP2]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%B = getelementptr inbounds [42 x i16], [42 x i16] addrspace(1)* @Arr_as1, i64 0, i64 %A
|
2013-08-22 03:53:10 +08:00
|
|
|
%C = ptrtoint i16 addrspace(1)* %B to i16
|
2015-03-14 02:20:45 +08:00
|
|
|
%G = sub i16 %C, ptrtoint (i16 addrspace(1)* getelementptr ([42 x i16], [42 x i16] addrspace(1)* @Arr_as1, i64 1, i64 0) to i16)
|
2013-08-22 03:53:10 +08:00
|
|
|
ret i16 %G
|
2010-01-02 06:42:29 +08:00
|
|
|
}
|
|
|
|
|
|
2010-01-31 10:30:23 +08:00
|
|
|
define i32 @test26(i32 %x) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test26(
|
|
|
|
|
; CHECK-NEXT: [[NEG:%.*]] = shl i32 -3, %x
|
|
|
|
|
; CHECK-NEXT: ret i32 [[NEG]]
|
|
|
|
|
;
|
2010-01-31 10:30:23 +08:00
|
|
|
%shl = shl i32 3, %x
|
|
|
|
|
%neg = sub i32 0, %shl
|
|
|
|
|
ret i32 %neg
|
|
|
|
|
}
|
2010-01-02 06:42:29 +08:00
|
|
|
|
2010-11-23 04:31:27 +08:00
|
|
|
define i32 @test27(i32 %x, i32 %y) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test27(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = shl i32 %y, 3
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add i32 [[TMP1]], %x
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2010-11-23 04:31:27 +08:00
|
|
|
%mul = mul i32 %y, -8
|
|
|
|
|
%sub = sub i32 %x, %mul
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define i32 @test28(i32 %x, i32 %y, i32 %z) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test28(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = mul i32 %z, %y
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add i32 [[TMP1]], %x
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2010-11-23 04:31:27 +08:00
|
|
|
%neg = sub i32 0, %z
|
|
|
|
|
%mul = mul i32 %neg, %y
|
|
|
|
|
%sub = sub i32 %x, %mul
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
2012-02-20 22:34:57 +08:00
|
|
|
|
|
|
|
|
define i64 @test29(i8* %foo, i64 %i, i64 %j) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test29(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = sub i64 %i, %j
|
|
|
|
|
; CHECK-NEXT: ret i64 [[TMP1]]
|
|
|
|
|
;
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%gep1 = getelementptr inbounds i8, i8* %foo, i64 %i
|
|
|
|
|
%gep2 = getelementptr inbounds i8, i8* %foo, i64 %j
|
2012-02-20 22:34:57 +08:00
|
|
|
%cast1 = ptrtoint i8* %gep1 to i64
|
|
|
|
|
%cast2 = ptrtoint i8* %gep2 to i64
|
|
|
|
|
%sub = sub i64 %cast1, %cast2
|
|
|
|
|
ret i64 %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define i64 @test30(i8* %foo, i64 %i, i64 %j) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test30(
|
|
|
|
|
; CHECK-NEXT: [[GEP1_IDX:%.*]] = shl nuw i64 %i, 2
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = sub i64 [[GEP1_IDX]], %j
|
|
|
|
|
; CHECK-NEXT: ret i64 [[TMP1]]
|
|
|
|
|
;
|
2012-02-20 22:34:57 +08:00
|
|
|
%bit = bitcast i8* %foo to i32*
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%gep1 = getelementptr inbounds i32, i32* %bit, i64 %i
|
|
|
|
|
%gep2 = getelementptr inbounds i8, i8* %foo, i64 %j
|
2012-02-20 22:34:57 +08:00
|
|
|
%cast1 = ptrtoint i32* %gep1 to i64
|
|
|
|
|
%cast2 = ptrtoint i8* %gep2 to i64
|
|
|
|
|
%sub = sub i64 %cast1, %cast2
|
|
|
|
|
ret i64 %sub
|
|
|
|
|
}
|
2013-08-22 03:53:10 +08:00
|
|
|
|
|
|
|
|
define i16 @test30_as1(i8 addrspace(1)* %foo, i16 %i, i16 %j) {
|
|
|
|
|
; CHECK-LABEL: @test30_as1(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[GEP1_IDX:%.*]] = shl nuw i16 %i, 2
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = sub i16 [[GEP1_IDX]], %j
|
|
|
|
|
; CHECK-NEXT: ret i16 [[TMP1]]
|
|
|
|
|
;
|
2013-08-22 03:53:10 +08:00
|
|
|
%bit = bitcast i8 addrspace(1)* %foo to i32 addrspace(1)*
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
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
2015-02-28 03:29:02 +08:00
|
|
|
%gep1 = getelementptr inbounds i32, i32 addrspace(1)* %bit, i16 %i
|
|
|
|
|
%gep2 = getelementptr inbounds i8, i8 addrspace(1)* %foo, i16 %j
|
2013-08-22 03:53:10 +08:00
|
|
|
%cast1 = ptrtoint i32 addrspace(1)* %gep1 to i16
|
|
|
|
|
%cast2 = ptrtoint i8 addrspace(1)* %gep2 to i16
|
|
|
|
|
%sub = sub i16 %cast1, %cast2
|
|
|
|
|
ret i16 %sub
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-19 23:24:22 +08:00
|
|
|
define <2 x i64> @test31(<2 x i64> %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test31(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add <2 x i64> %A, <i64 3, i64 4>
|
|
|
|
|
; CHECK-NEXT: ret <2 x i64> [[SUB]]
|
|
|
|
|
;
|
2014-01-19 23:24:22 +08:00
|
|
|
%xor = xor <2 x i64> %A, <i64 -1, i64 -1>
|
|
|
|
|
%sub = sub <2 x i64> <i64 2, i64 3>, %xor
|
|
|
|
|
ret <2 x i64> %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define <2 x i64> @test32(<2 x i64> %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test32(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = sub <2 x i64> <i64 3, i64 4>, %A
|
|
|
|
|
; CHECK-NEXT: ret <2 x i64> [[SUB]]
|
|
|
|
|
;
|
2014-01-19 23:24:22 +08:00
|
|
|
%add = add <2 x i64> %A, <i64 -1, i64 -1>
|
|
|
|
|
%sub = sub <2 x i64> <i64 2, i64 3>, %add
|
|
|
|
|
ret <2 x i64> %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define <2 x i64> @test33(<2 x i1> %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test33(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = sext <2 x i1> %A to <2 x i64>
|
|
|
|
|
; CHECK-NEXT: ret <2 x i64> [[SUB]]
|
|
|
|
|
;
|
2014-01-19 23:24:22 +08:00
|
|
|
%ext = zext <2 x i1> %A to <2 x i64>
|
|
|
|
|
%sub = sub <2 x i64> zeroinitializer, %ext
|
|
|
|
|
ret <2 x i64> %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define <2 x i64> @test34(<2 x i1> %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test34(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = zext <2 x i1> %A to <2 x i64>
|
|
|
|
|
; CHECK-NEXT: ret <2 x i64> [[SUB]]
|
|
|
|
|
;
|
2014-01-19 23:24:22 +08:00
|
|
|
%ext = sext <2 x i1> %A to <2 x i64>
|
|
|
|
|
%sub = sub <2 x i64> zeroinitializer, %ext
|
|
|
|
|
ret <2 x i64> %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define <2 x i64> @test35(<2 x i64> %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test35(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = mul <2 x i64> %A, <i64 -2, i64 -3>
|
|
|
|
|
; CHECK-NEXT: ret <2 x i64> [[SUB]]
|
|
|
|
|
;
|
2014-01-19 23:24:22 +08:00
|
|
|
%mul = mul <2 x i64> %A, <i64 3, i64 4>
|
|
|
|
|
%sub = sub <2 x i64> %A, %mul
|
|
|
|
|
ret <2 x i64> %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define <2 x i64> @test36(<2 x i64> %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test36(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = mul <2 x i64> %A, <i64 7, i64 15>
|
|
|
|
|
; CHECK-NEXT: ret <2 x i64> [[SUB]]
|
|
|
|
|
;
|
2014-01-19 23:24:22 +08:00
|
|
|
%shl = shl <2 x i64> %A, <i64 3, i64 4>
|
|
|
|
|
%sub = sub <2 x i64> %shl, %A
|
|
|
|
|
ret <2 x i64> %sub
|
|
|
|
|
}
|
2014-07-02 14:07:09 +08:00
|
|
|
|
2014-07-02 14:14:13 +08:00
|
|
|
define <2 x i32> @test37(<2 x i32> %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test37(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = icmp eq <2 x i32> %A, <i32 -2147483648, i32 -2147483648>
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = sext <2 x i1> [[TMP1]] to <2 x i32>
|
|
|
|
|
; CHECK-NEXT: ret <2 x i32> [[SUB]]
|
|
|
|
|
;
|
2014-07-02 14:14:13 +08:00
|
|
|
%div = sdiv <2 x i32> %A, <i32 -2147483648, i32 -2147483648>
|
|
|
|
|
%sub = sub nsw <2 x i32> zeroinitializer, %div
|
|
|
|
|
ret <2 x i32> %sub
|
2014-07-02 14:07:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define i32 @test38(i32 %A) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test38(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = icmp eq i32 %A, -2147483648
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = sext i1 [[TMP1]] to i32
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2014-07-02 14:07:09 +08:00
|
|
|
%div = sdiv i32 %A, -2147483648
|
|
|
|
|
%sub = sub nsw i32 0, %div
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
2014-07-31 12:49:29 +08:00
|
|
|
|
|
|
|
|
define i32 @test39(i32 %A, i32 %x) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test39(
|
|
|
|
|
; CHECK-NEXT: [[C:%.*]] = add i32 %x, %A
|
|
|
|
|
; CHECK-NEXT: ret i32 [[C]]
|
|
|
|
|
;
|
2014-07-31 12:49:29 +08:00
|
|
|
%B = sub i32 0, %A
|
|
|
|
|
%C = sub nsw i32 %x, %B
|
|
|
|
|
ret i32 %C
|
|
|
|
|
}
|
2014-08-20 07:36:30 +08:00
|
|
|
|
|
|
|
|
define i16 @test40(i16 %a, i16 %b) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test40(
|
|
|
|
|
; CHECK-NEXT: [[ASHR:%.*]] = ashr i16 %a, 1
|
|
|
|
|
; CHECK-NEXT: [[ASHR1:%.*]] = ashr i16 %b, 1
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = sub nsw i16 [[ASHR]], [[ASHR1]]
|
|
|
|
|
; CHECK-NEXT: ret i16 [[SUB]]
|
|
|
|
|
;
|
2014-08-20 07:36:30 +08:00
|
|
|
%ashr = ashr i16 %a, 1
|
|
|
|
|
%ashr1 = ashr i16 %b, 1
|
|
|
|
|
%sub = sub i16 %ashr, %ashr1
|
|
|
|
|
ret i16 %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define i32 @test41(i16 %a, i16 %b) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test41(
|
|
|
|
|
; CHECK-NEXT: [[CONV:%.*]] = sext i16 %a to i32
|
|
|
|
|
; CHECK-NEXT: [[CONV1:%.*]] = sext i16 %b to i32
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = sub nsw i32 [[CONV]], [[CONV1]]
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2014-08-20 07:36:30 +08:00
|
|
|
%conv = sext i16 %a to i32
|
|
|
|
|
%conv1 = sext i16 %b to i32
|
|
|
|
|
%sub = sub i32 %conv, %conv1
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define i4 @test42(i4 %x, i4 %y) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test42(
|
|
|
|
|
; CHECK-NEXT: [[A:%.*]] = and i4 %y, 7
|
|
|
|
|
; CHECK-NEXT: [[B:%.*]] = and i4 %x, 7
|
|
|
|
|
; CHECK-NEXT: [[C:%.*]] = sub nsw i4 [[A]], [[B]]
|
|
|
|
|
; CHECK-NEXT: ret i4 [[C]]
|
|
|
|
|
;
|
2014-08-20 07:36:30 +08:00
|
|
|
%a = and i4 %y, 7
|
|
|
|
|
%b = and i4 %x, 7
|
|
|
|
|
%c = sub i4 %a, %b
|
|
|
|
|
ret i4 %c
|
2014-08-20 15:17:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define i4 @test43(i4 %x, i4 %y) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test43(
|
|
|
|
|
; CHECK-NEXT: [[A:%.*]] = or i4 %x, -8
|
|
|
|
|
; CHECK-NEXT: [[B:%.*]] = and i4 %y, 7
|
|
|
|
|
; CHECK-NEXT: [[C:%.*]] = sub nuw i4 [[A]], [[B]]
|
|
|
|
|
; CHECK-NEXT: ret i4 [[C]]
|
|
|
|
|
;
|
2014-08-20 15:17:31 +08:00
|
|
|
%a = or i4 %x, -8
|
|
|
|
|
%b = and i4 %y, 7
|
|
|
|
|
%c = sub i4 %a, %b
|
|
|
|
|
ret i4 %c
|
2014-08-20 07:36:30 +08:00
|
|
|
}
|
2014-08-23 00:41:23 +08:00
|
|
|
|
|
|
|
|
define i32 @test44(i32 %x) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test44(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add nsw i32 %x, -32768
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2014-08-23 00:41:23 +08:00
|
|
|
%sub = sub nsw i32 %x, 32768
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
2014-10-19 16:32:32 +08:00
|
|
|
|
|
|
|
|
define i32 @test45(i32 %x, i32 %y) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test45(
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = and i32 %x, %y
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2014-10-19 16:32:32 +08:00
|
|
|
%or = or i32 %x, %y
|
|
|
|
|
%xor = xor i32 %x, %y
|
|
|
|
|
%sub = sub i32 %or, %xor
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
2014-11-03 13:53:55 +08:00
|
|
|
|
|
|
|
|
define i32 @test46(i32 %x, i32 %y) {
|
|
|
|
|
; CHECK-LABEL: @test46(
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-NEXT: [[X_NOT:%.*]] = xor i32 %x, -1
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = and i32 %y, [[X_NOT]]
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
|
|
|
|
%or = or i32 %x, %y
|
|
|
|
|
%sub = sub i32 %or, %x
|
|
|
|
|
ret i32 %sub
|
2014-11-03 13:53:55 +08:00
|
|
|
}
|
2015-06-23 10:49:24 +08:00
|
|
|
|
|
|
|
|
define i32 @test47(i1 %A, i32 %B, i32 %C, i32 %D) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test47(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = sub i32 %D, %C
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = select i1 %A, i32 [[TMP1]], i32 0
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2015-06-23 10:49:24 +08:00
|
|
|
%sel0 = select i1 %A, i32 %D, i32 %B
|
|
|
|
|
%sel1 = select i1 %A, i32 %C, i32 %B
|
|
|
|
|
%sub = sub i32 %sel0, %sel1
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define i32 @test48(i1 %A, i32 %B, i32 %C, i32 %D) {
|
2016-09-09 05:40:21 +08:00
|
|
|
; CHECK-LABEL: @test48(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = sub i32 %D, %C
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = select i1 %A, i32 0, i32 [[TMP1]]
|
|
|
|
|
; CHECK-NEXT: ret i32 [[SUB]]
|
|
|
|
|
;
|
2015-06-23 10:49:24 +08:00
|
|
|
%sel0 = select i1 %A, i32 %B, i32 %D
|
|
|
|
|
%sel1 = select i1 %A, i32 %B, i32 %C
|
|
|
|
|
%sub = sub i32 %sel0, %sel1
|
|
|
|
|
ret i32 %sub
|
|
|
|
|
}
|
2016-10-14 23:24:31 +08:00
|
|
|
|
|
|
|
|
; Zext+add is more canonical than sext+sub.
|
|
|
|
|
|
|
|
|
|
define i8 @bool_sext_sub(i8 %x, i1 %y) {
|
|
|
|
|
; CHECK-LABEL: @bool_sext_sub(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = zext i1 %y to i8
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add i8 [[TMP1]], %x
|
|
|
|
|
; CHECK-NEXT: ret i8 [[SUB]]
|
|
|
|
|
;
|
|
|
|
|
%sext = sext i1 %y to i8
|
|
|
|
|
%sub = sub i8 %x, %sext
|
|
|
|
|
ret i8 %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Vectors get the same transform.
|
|
|
|
|
|
|
|
|
|
define <2 x i8> @bool_sext_sub_vec(<2 x i8> %x, <2 x i1> %y) {
|
|
|
|
|
; CHECK-LABEL: @bool_sext_sub_vec(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = zext <2 x i1> %y to <2 x i8>
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add <2 x i8> [[TMP1]], %x
|
|
|
|
|
; CHECK-NEXT: ret <2 x i8> [[SUB]]
|
|
|
|
|
;
|
|
|
|
|
%sext = sext <2 x i1> %y to <2 x i8>
|
|
|
|
|
%sub = sub <2 x i8> %x, %sext
|
|
|
|
|
ret <2 x i8> %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; NSW is preserved.
|
|
|
|
|
|
|
|
|
|
define <2 x i8> @bool_sext_sub_vec_nsw(<2 x i8> %x, <2 x i1> %y) {
|
|
|
|
|
; CHECK-LABEL: @bool_sext_sub_vec_nsw(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = zext <2 x i1> %y to <2 x i8>
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add nsw <2 x i8> [[TMP1]], %x
|
|
|
|
|
; CHECK-NEXT: ret <2 x i8> [[SUB]]
|
|
|
|
|
;
|
|
|
|
|
%sext = sext <2 x i1> %y to <2 x i8>
|
|
|
|
|
%sub = sub nsw <2 x i8> %x, %sext
|
|
|
|
|
ret <2 x i8> %sub
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; We favor the canonical zext+add over keeping the NUW.
|
|
|
|
|
|
|
|
|
|
define i8 @bool_sext_sub_nuw(i8 %x, i1 %y) {
|
|
|
|
|
; CHECK-LABEL: @bool_sext_sub_nuw(
|
|
|
|
|
; CHECK-NEXT: [[TMP1:%.*]] = zext i1 %y to i8
|
|
|
|
|
; CHECK-NEXT: [[SUB:%.*]] = add i8 [[TMP1]], %x
|
|
|
|
|
; CHECK-NEXT: ret i8 [[SUB]]
|
|
|
|
|
;
|
|
|
|
|
%sext = sext i1 %y to i8
|
|
|
|
|
%sub = sub nuw i8 %x, %sext
|
|
|
|
|
ret i8 %sub
|
|
|
|
|
}
|
|
|
|
|
|