mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-22 15:18:24 +00:00
IR: Make metadata typeless in assembly
Now that `Metadata` is typeless, reflect that in the assembly. These
are the matching assembly changes for the metadata/value split in
r223802.
- Only use the `metadata` type when referencing metadata from a call
intrinsic -- i.e., only when it's used as a `Value`.
- Stop pretending that `ValueAsMetadata` is wrapped in an `MDNode`
when referencing it from call intrinsics.
So, assembly like this:
define @foo(i32 %v) {
call void @llvm.foo(metadata !{i32 %v}, metadata !0)
call void @llvm.foo(metadata !{i32 7}, metadata !0)
call void @llvm.foo(metadata !1, metadata !0)
call void @llvm.foo(metadata !3, metadata !0)
call void @llvm.foo(metadata !{metadata !3}, metadata !0)
ret void, !bar !2
}
!0 = metadata !{metadata !2}
!1 = metadata !{i32* @global}
!2 = metadata !{metadata !3}
!3 = metadata !{}
turns into this:
define @foo(i32 %v) {
call void @llvm.foo(metadata i32 %v, metadata !0)
call void @llvm.foo(metadata i32 7, metadata !0)
call void @llvm.foo(metadata i32* @global, metadata !0)
call void @llvm.foo(metadata !3, metadata !0)
call void @llvm.foo(metadata !{!3}, metadata !0)
ret void, !bar !2
}
!0 = !{!2}
!1 = !{i32* @global}
!2 = !{!3}
!3 = !{}
I wrote an upgrade script that handled almost all of the tests in llvm
and many of the tests in cfe (even handling many `CHECK` lines). I've
attached it (or will attach it in a moment if you're speedy) to PR21532
to help everyone update their out-of-tree testcases.
This is part of PR21532.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224257 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
@@ -39,8 +39,8 @@ for.end: ; preds = %for.body
|
||||
}
|
||||
|
||||
; Now, we check for the Hint metadata
|
||||
; CHECK: [[vect]] = metadata !{metadata [[vect]], metadata [[width:![0-9]+]], metadata [[unroll:![0-9]+]]}
|
||||
; CHECK: [[width]] = metadata !{metadata !"llvm.loop.vectorize.width", i32 1}
|
||||
; CHECK: [[unroll]] = metadata !{metadata !"llvm.loop.interleave.count", i32 1}
|
||||
; CHECK: [[scalar]] = metadata !{metadata [[scalar]], metadata [[width]], metadata [[unroll]]}
|
||||
; CHECK: [[vect]] = !{[[vect]], [[width:![0-9]+]], [[unroll:![0-9]+]]}
|
||||
; CHECK: [[width]] = !{!"llvm.loop.vectorize.width", i32 1}
|
||||
; CHECK: [[unroll]] = !{!"llvm.loop.interleave.count", i32 1}
|
||||
; CHECK: [[scalar]] = !{[[scalar]], [[width]], [[unroll]]}
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ for.end15: ; preds = %for.end.us, %entry
|
||||
|
||||
attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-frame-pointer-elim-non-leaf"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "unsafe-fp-math"="false" "use-soft-float"="false" }
|
||||
|
||||
!3 = metadata !{metadata !4, metadata !5}
|
||||
!4 = metadata !{metadata !4}
|
||||
!5 = metadata !{metadata !5}
|
||||
!3 = !{!4, !5}
|
||||
!4 = !{!4}
|
||||
!5 = !{!5}
|
||||
|
||||
|
||||
@@ -170,7 +170,7 @@ for.end: ; preds = %for.body
|
||||
ret i32 %1
|
||||
}
|
||||
|
||||
!0 = metadata !{metadata !0, metadata !1}
|
||||
!1 = metadata !{metadata !"llvm.loop.vectorize.enable", i1 1}
|
||||
!2 = metadata !{metadata !2, metadata !3}
|
||||
!3 = metadata !{metadata !"llvm.loop.vectorize.enable", i1 0}
|
||||
!0 = !{!0, !1}
|
||||
!1 = !{!"llvm.loop.vectorize.enable", i1 1}
|
||||
!2 = !{!2, !3}
|
||||
!3 = !{!"llvm.loop.vectorize.enable", i1 0}
|
||||
|
||||
@@ -46,4 +46,4 @@ for.end: ; preds = %for.body
|
||||
ret void
|
||||
}
|
||||
|
||||
!3 = metadata !{metadata !3}
|
||||
!3 = !{!3}
|
||||
|
||||
@@ -104,8 +104,8 @@ for.end: ; preds = %for.body
|
||||
ret void
|
||||
}
|
||||
|
||||
!3 = metadata !{metadata !3}
|
||||
!4 = metadata !{metadata !4}
|
||||
!5 = metadata !{metadata !3, metadata !4}
|
||||
!6 = metadata !{metadata !6}
|
||||
!7 = metadata !{metadata !7}
|
||||
!3 = !{!3}
|
||||
!4 = !{!4}
|
||||
!5 = !{!3, !4}
|
||||
!6 = !{!6}
|
||||
!7 = !{!7}
|
||||
|
||||
@@ -139,7 +139,7 @@ define void @example4(i32 %n, i32* noalias nocapture %p, i32* noalias nocapture
|
||||
ret void
|
||||
}
|
||||
|
||||
!0 = metadata !{metadata !"branch_weights", i32 64, i32 4}
|
||||
!0 = !{!"branch_weights", i32 64, i32 4}
|
||||
|
||||
; We can't vectorize this one because we need a runtime ptr check.
|
||||
;CHECK-LABEL: @example23(
|
||||
|
||||
@@ -52,8 +52,8 @@ for.end:
|
||||
ret void
|
||||
}
|
||||
|
||||
!1 = metadata !{metadata !1, metadata !2}
|
||||
!2 = metadata !{metadata !"llvm.loop.vectorize.enable", i1 true}
|
||||
!1 = !{!1, !2}
|
||||
!2 = !{!"llvm.loop.vectorize.enable", i1 true}
|
||||
|
||||
;
|
||||
; This method will not be vectorized, as scalar cost is lower than any of vector costs.
|
||||
@@ -89,5 +89,5 @@ for.end:
|
||||
declare float @llvm.sin.f32(float) nounwind readnone
|
||||
|
||||
; Dummy metadata
|
||||
!3 = metadata !{metadata !3}
|
||||
!3 = !{!3}
|
||||
|
||||
|
||||
@@ -43,8 +43,8 @@ for.end:
|
||||
ret void
|
||||
}
|
||||
|
||||
!1 = metadata !{metadata !1, metadata !2}
|
||||
!2 = metadata !{metadata !"llvm.loop.vectorize.enable", i1 true}
|
||||
!1 = !{!1, !2}
|
||||
!2 = !{!"llvm.loop.vectorize.enable", i1 true}
|
||||
|
||||
;
|
||||
; This loop will not be vectorized as the trip count is below the threshold.
|
||||
@@ -69,5 +69,5 @@ for.end:
|
||||
ret void
|
||||
}
|
||||
|
||||
!3 = metadata !{metadata !3}
|
||||
!3 = !{!3}
|
||||
|
||||
|
||||
@@ -122,40 +122,40 @@ attributes #0 = { nounwind }
|
||||
!llvm.module.flags = !{!9, !10}
|
||||
!llvm.ident = !{!11}
|
||||
|
||||
!0 = metadata !{metadata !"0x11\004\00clang version 3.5.0\001\00\006\00\002", metadata !1, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2} ; [ DW_TAG_compile_unit ] [./source.cpp] [DW_LANG_C_plus_plus]
|
||||
!1 = metadata !{metadata !"source.cpp", metadata !"."}
|
||||
!2 = metadata !{}
|
||||
!3 = metadata !{metadata !4, metadata !7, metadata !8}
|
||||
!4 = metadata !{metadata !"0x2e\00test\00test\00\001\000\001\000\006\00256\001\001", metadata !1, metadata !5, metadata !6, null, void (i32*, i32)* @_Z4testPii, null, null, metadata !2} ; [ DW_TAG_subprogram ] [line 1] [def] [test]
|
||||
!5 = metadata !{metadata !"0x29", metadata !1} ; [ DW_TAG_file_type ] [./source.cpp]
|
||||
!6 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", i32 0, null, null, metadata !2, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
|
||||
!7 = metadata !{metadata !"0x2e\00test_disabled\00test_disabled\00\0010\000\001\000\006\00256\001\0010", metadata !1, metadata !5, metadata !6, null, void (i32*, i32)* @_Z13test_disabledPii, null, null, metadata !2} ; [ DW_TAG_subprogram ] [line 10] [def] [test_disabled]
|
||||
!8 = metadata !{metadata !"0x2e\00test_array_bounds\00test_array_bounds\00\0016\000\001\000\006\00256\001\0016", metadata !1, metadata !5, metadata !6, null, void (i32*, i32*, i32)* @_Z17test_array_boundsPiS_i, null, null, metadata !2} ; [ DW_TAG_subprogram ] [line 16] [def] [test_array_bounds]
|
||||
!9 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}
|
||||
!10 = metadata !{i32 2, metadata !"Debug Info Version", i32 2}
|
||||
!11 = metadata !{metadata !"clang version 3.5.0"}
|
||||
!12 = metadata !{i32 3, i32 8, metadata !13, null}
|
||||
!13 = metadata !{metadata !"0xb\003\003\000", metadata !1, metadata !4} ; [ DW_TAG_lexical_block ]
|
||||
!14 = metadata !{metadata !14, metadata !15, metadata !15}
|
||||
!15 = metadata !{metadata !"llvm.loop.vectorize.enable", i1 true}
|
||||
!16 = metadata !{i32 4, i32 5, metadata !17, null}
|
||||
!17 = metadata !{metadata !"0xb\003\0036\000", metadata !1, metadata !13} ; [ DW_TAG_lexical_block ]
|
||||
!18 = metadata !{metadata !19, metadata !19, i64 0}
|
||||
!19 = metadata !{metadata !"int", metadata !20, i64 0}
|
||||
!20 = metadata !{metadata !"omnipotent char", metadata !21, i64 0}
|
||||
!21 = metadata !{metadata !"Simple C/C++ TBAA"}
|
||||
!22 = metadata !{i32 5, i32 9, metadata !23, null}
|
||||
!23 = metadata !{metadata !"0xb\005\009\000", metadata !1, metadata !17} ; [ DW_TAG_lexical_block ]
|
||||
!24 = metadata !{i32 8, i32 1, metadata !4, null}
|
||||
!25 = metadata !{i32 12, i32 8, metadata !26, null}
|
||||
!26 = metadata !{metadata !"0xb\0012\003\000", metadata !1, metadata !7} ; [ DW_TAG_lexical_block ]
|
||||
!27 = metadata !{metadata !27, metadata !28, metadata !29}
|
||||
!28 = metadata !{metadata !"llvm.loop.interleave.count", i32 1}
|
||||
!29 = metadata !{metadata !"llvm.loop.vectorize.width", i32 1}
|
||||
!30 = metadata !{i32 13, i32 5, metadata !26, null}
|
||||
!31 = metadata !{i32 14, i32 1, metadata !7, null}
|
||||
!32 = metadata !{i32 18, i32 8, metadata !33, null}
|
||||
!33 = metadata !{metadata !"0xb\0018\003\000", metadata !1, metadata !8} ; [ DW_TAG_lexical_block ]
|
||||
!34 = metadata !{metadata !34, metadata !15}
|
||||
!35 = metadata !{i32 19, i32 5, metadata !33, null}
|
||||
!36 = metadata !{i32 20, i32 1, metadata !8, null}
|
||||
!0 = !{!"0x11\004\00clang version 3.5.0\001\00\006\00\002", !1, !2, !2, !3, !2, !2} ; [ DW_TAG_compile_unit ] [./source.cpp] [DW_LANG_C_plus_plus]
|
||||
!1 = !{!"source.cpp", !"."}
|
||||
!2 = !{}
|
||||
!3 = !{!4, !7, !8}
|
||||
!4 = !{!"0x2e\00test\00test\00\001\000\001\000\006\00256\001\001", !1, !5, !6, null, void (i32*, i32)* @_Z4testPii, null, null, !2} ; [ DW_TAG_subprogram ] [line 1] [def] [test]
|
||||
!5 = !{!"0x29", !1} ; [ DW_TAG_file_type ] [./source.cpp]
|
||||
!6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !2, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
|
||||
!7 = !{!"0x2e\00test_disabled\00test_disabled\00\0010\000\001\000\006\00256\001\0010", !1, !5, !6, null, void (i32*, i32)* @_Z13test_disabledPii, null, null, !2} ; [ DW_TAG_subprogram ] [line 10] [def] [test_disabled]
|
||||
!8 = !{!"0x2e\00test_array_bounds\00test_array_bounds\00\0016\000\001\000\006\00256\001\0016", !1, !5, !6, null, void (i32*, i32*, i32)* @_Z17test_array_boundsPiS_i, null, null, !2} ; [ DW_TAG_subprogram ] [line 16] [def] [test_array_bounds]
|
||||
!9 = !{i32 2, !"Dwarf Version", i32 2}
|
||||
!10 = !{i32 2, !"Debug Info Version", i32 2}
|
||||
!11 = !{!"clang version 3.5.0"}
|
||||
!12 = !{i32 3, i32 8, !13, null}
|
||||
!13 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ]
|
||||
!14 = !{!14, !15, !15}
|
||||
!15 = !{!"llvm.loop.vectorize.enable", i1 true}
|
||||
!16 = !{i32 4, i32 5, !17, null}
|
||||
!17 = !{!"0xb\003\0036\000", !1, !13} ; [ DW_TAG_lexical_block ]
|
||||
!18 = !{!19, !19, i64 0}
|
||||
!19 = !{!"int", !20, i64 0}
|
||||
!20 = !{!"omnipotent char", !21, i64 0}
|
||||
!21 = !{!"Simple C/C++ TBAA"}
|
||||
!22 = !{i32 5, i32 9, !23, null}
|
||||
!23 = !{!"0xb\005\009\000", !1, !17} ; [ DW_TAG_lexical_block ]
|
||||
!24 = !{i32 8, i32 1, !4, null}
|
||||
!25 = !{i32 12, i32 8, !26, null}
|
||||
!26 = !{!"0xb\0012\003\000", !1, !7} ; [ DW_TAG_lexical_block ]
|
||||
!27 = !{!27, !28, !29}
|
||||
!28 = !{!"llvm.loop.interleave.count", i32 1}
|
||||
!29 = !{!"llvm.loop.vectorize.width", i32 1}
|
||||
!30 = !{i32 13, i32 5, !26, null}
|
||||
!31 = !{i32 14, i32 1, !7, null}
|
||||
!32 = !{i32 18, i32 8, !33, null}
|
||||
!33 = !{!"0xb\0018\003\000", !1, !8} ; [ DW_TAG_lexical_block ]
|
||||
!34 = !{!34, !15}
|
||||
!35 = !{i32 19, i32 5, !33, null}
|
||||
!36 = !{i32 20, i32 1, !8, null}
|
||||
|
||||
@@ -49,26 +49,26 @@ declare void @ibar(i32*) #1
|
||||
!llvm.module.flags = !{!7, !8}
|
||||
!llvm.ident = !{!9}
|
||||
|
||||
!1 = metadata !{metadata !"vectorization-remarks.c", metadata !"."}
|
||||
!2 = metadata !{}
|
||||
!3 = metadata !{metadata !4}
|
||||
!4 = metadata !{metadata !"0x2e\00foo\00foo\00\005\000\001\000\006\00256\001\006", metadata !1, metadata !5, metadata !6, null, i32 (i32)* @foo, null, null, metadata !2} ; [ DW_TAG_subprogram ] [line 5] [def] [scope 6] [foo]
|
||||
!5 = metadata !{metadata !"0x29", metadata !1} ; [ DW_TAG_file_type ] [./vectorization-remarks.c]
|
||||
!6 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", i32 0, null, null, metadata !2, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
|
||||
!7 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
|
||||
!8 = metadata !{i32 1, metadata !"Debug Info Version", i32 2}
|
||||
!9 = metadata !{metadata !"clang version 3.5.0 "}
|
||||
!10 = metadata !{i32 8, i32 3, metadata !4, null}
|
||||
!11 = metadata !{metadata !12, metadata !12, i64 0}
|
||||
!12 = metadata !{metadata !"int", metadata !13, i64 0}
|
||||
!13 = metadata !{metadata !"omnipotent char", metadata !14, i64 0}
|
||||
!14 = metadata !{metadata !"Simple C/C++ TBAA"}
|
||||
!15 = metadata !{i32 17, i32 8, metadata !16, null}
|
||||
!16 = metadata !{metadata !"0xb\0017\008\002", metadata !1, metadata !17} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!17 = metadata !{metadata !"0xb\0017\008\001", metadata !1, metadata !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!18 = metadata !{metadata !"0xb\0017\003\000", metadata !1, metadata !4} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!19 = metadata !{i32 18, i32 5, metadata !20, null}
|
||||
!20 = metadata !{metadata !"0xb\0017\0027\000", metadata !1, metadata !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!21 = metadata !{metadata !13, metadata !13, i64 0}
|
||||
!22 = metadata !{i32 20, i32 3, metadata !4, null}
|
||||
!23 = metadata !{i32 21, i32 3, metadata !4, null}
|
||||
!1 = !{!"vectorization-remarks.c", !"."}
|
||||
!2 = !{}
|
||||
!3 = !{!4}
|
||||
!4 = !{!"0x2e\00foo\00foo\00\005\000\001\000\006\00256\001\006", !1, !5, !6, null, i32 (i32)* @foo, null, null, !2} ; [ DW_TAG_subprogram ] [line 5] [def] [scope 6] [foo]
|
||||
!5 = !{!"0x29", !1} ; [ DW_TAG_file_type ] [./vectorization-remarks.c]
|
||||
!6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !2, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
|
||||
!7 = !{i32 2, !"Dwarf Version", i32 4}
|
||||
!8 = !{i32 1, !"Debug Info Version", i32 2}
|
||||
!9 = !{!"clang version 3.5.0 "}
|
||||
!10 = !{i32 8, i32 3, !4, null}
|
||||
!11 = !{!12, !12, i64 0}
|
||||
!12 = !{!"int", !13, i64 0}
|
||||
!13 = !{!"omnipotent char", !14, i64 0}
|
||||
!14 = !{!"Simple C/C++ TBAA"}
|
||||
!15 = !{i32 17, i32 8, !16, null}
|
||||
!16 = !{!"0xb\0017\008\002", !1, !17} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!17 = !{!"0xb\0017\008\001", !1, !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!18 = !{!"0xb\0017\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!19 = !{i32 18, i32 5, !20, null}
|
||||
!20 = !{!"0xb\0017\0027\000", !1, !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]
|
||||
!21 = !{!13, !13, i64 0}
|
||||
!22 = !{i32 20, i32 3, !4, null}
|
||||
!23 = !{i32 21, i32 3, !4, null}
|
||||
|
||||
Reference in New Issue
Block a user