refactor payloadHeader implicit kernel argument

IGC contains two versions of implicit kernel argument payloadHeader:
 1. 8 x i32 packing global_id_offset (3 x i32), local_size (3 x i32)
    and 2 x i32 reserved.
 2. 3 x i32 packing only global_id_offset (3 x i32)

This commit refactors payloadHeader.

Author: pkwasnie-intel

IGC/AdaptorCommon/ImplicitArgs.cpp

@@ -25,6 +25,7 @@ static const std::vector<ImplicitArg> IMPLICIT_ARGS = {
     ImplicitArg(ImplicitArg::R0, "r0", ImplicitArg::INT, WIAnalysis::UNIFORM_THREAD, 8, ImplicitArg::ALIGN_GRF, false, GenISAIntrinsic::GenISA_getR0),
 
     ImplicitArg(ImplicitArg::PAYLOAD_HEADER, "payloadHeader", ImplicitArg::INT, WIAnalysis::UNIFORM_WORKGROUP, 8, ImplicitArg::ALIGN_GRF, true, GenISAIntrinsic::GenISA_getPayloadHeader),
+    ImplicitArg(ImplicitArg::PAYLOAD_HEADER_SHORT, "payloadHeader", ImplicitArg::INT, WIAnalysis::UNIFORM_WORKGROUP, 3, ImplicitArg::ALIGN_DWORD, true, GenISAIntrinsic::GenISA_getPayloadHeader),
     ImplicitArg(ImplicitArg::WORK_DIM, "workDim", ImplicitArg::INT, WIAnalysis::UNIFORM_GLOBAL, 1, ImplicitArg::ALIGN_DWORD, true, GenISAIntrinsic::GenISA_getWorkDim),
 
     ImplicitArg(ImplicitArg::NUM_GROUPS, "numWorkGroups", ImplicitArg::INT, WIAnalysis::UNIFORM_GLOBAL, 3, ImplicitArg::ALIGN_DWORD, true, GenISAIntrinsic::GenISA_getNumWorkGroups),
@@ -104,8 +105,6 @@ static const std::vector<ImplicitArg> IMPLICIT_ARGS = {
 
     // BufferBoundsChecking
     ImplicitArg(ImplicitArg::BUFFER_SIZE, "bufferSize", ImplicitArg::LONG, WIAnalysis::UNIFORM_GLOBAL, 1, ImplicitArg::ALIGN_QWORD, true),
-
-    ImplicitArg(ImplicitArg::PAYLOAD_HEADER_SHORT, "payloadHeader", ImplicitArg::INT, WIAnalysis::UNIFORM_WORKGROUP, 3, ImplicitArg::ALIGN_DWORD, true, GenISAIntrinsic::GenISA_getPayloadHeader),
 };
 
 ImplicitArg::ImplicitArg(

IGC/AdaptorCommon/ImplicitArgs.hpp

@@ -38,6 +38,7 @@ namespace IGC
             R0,
             START_ID = R0,
             PAYLOAD_HEADER,
+            PAYLOAD_HEADER_SHORT, // reduces PayloadHeader to 3xi32
 
             // WI information
             WORK_DIM,
@@ -130,8 +131,6 @@ namespace IGC
             // BufferBoundsChecking
             BUFFER_SIZE,
 
-            PAYLOAD_HEADER_SHORT,
-
             NUM_IMPLICIT_ARGS
         };
 

IGC/Compiler/tests/AddImplicitArgs/rti-typed-pointers.ll

@@ -52,9 +52,9 @@ declare i32 addrspace(1)* @llvm.genx.GenISA.InlinedData(i16)
 !1 = !{!2, !3}
 !2 = !{!"function_type", i32 0}
 !3 = !{!"implicit_arg_desc", !4, !5, !6, !7}
-!4 = !{i32 54}
-!5 = !{i32 55}
-!6 = !{i32 57}
-!7 = !{i32 56}
+!4 = !{i32 55}
+!5 = !{i32 56}
+!6 = !{i32 58}
+!7 = !{i32 57}
 !8 = !{void ()* @rti, !1}
 !9 = !{void ()* @foo, !1}

IGC/Compiler/tests/AddImplicitArgs/rti.ll

@@ -53,9 +53,9 @@ declare ptr addrspace(1) @llvm.genx.GenISA.InlinedData(i16)
 !1 = !{!2, !3}
 !2 = !{!"function_type", i32 0}
 !3 = !{!"implicit_arg_desc", !4, !5, !6, !7}
-!4 = !{i32 54}
-!5 = !{i32 55}
-!6 = !{i32 57}
-!7 = !{i32 56}
+!4 = !{i32 55}
+!5 = !{i32 56}
+!6 = !{i32 58}
+!7 = !{i32 57}
 !8 = !{ptr @rti, !1}
 !9 = !{ptr @foo, !1}

IGC/Compiler/tests/AddImplicitArgs/signatiure_changed_GlobalSize-typed-pointers.ll

@@ -19,7 +19,7 @@ define i32 @foo(i32 %x) nounwind {
 !2 =  !{ !"function_type", i32 0}
 !3 =  !{ !"arg_desc"}
 !4 =  !{ !"implicit_arg_desc",  !6}
-!6 =  !{i32 4}
+!6 =  !{i32 5}
 
 ; CHECK:         define i32 @foo(i32 %x, <3 x i32> %globalSize)
 ; CHECK-NOT:    define i32 @foo(i32 %x)

IGC/Compiler/tests/AddImplicitArgs/signatiure_changed_GlobalSize.ll

@@ -20,7 +20,7 @@ define i32 @foo(i32 %x) nounwind {
 !2 =  !{ !"function_type", i32 0}
 !3 =  !{ !"arg_desc"}
 !4 =  !{ !"implicit_arg_desc",  !6}
-!6 =  !{i32 4}
+!6 =  !{i32 5}
 
 ; CHECK:         define i32 @foo(i32 %x, <3 x i32> %globalSize)
 ; CHECK-NOT:    define i32 @foo(i32 %x)

IGC/Compiler/tests/AddImplicitArgs/signatiure_changed_LocaIdsl-typed-pointers.ll

@@ -19,9 +19,9 @@ define i32 @foo(i32 %x) nounwind {
 !2 =  !{ !"function_type", i32 0}
 !3 =  !{ !"arg_desc"}
 !4 =  !{ !"implicit_arg_desc",  !6,  !7,  !8}
-!6 =  !{i32 7}
-!7 =  !{i32 8}
-!8 =  !{i32 9}
+!6 =  !{i32 8}
+!7 =  !{i32 9}
+!8 =  !{i32 10}
 
 ; CHECK:         define i32 @foo(i32 %x, i16 %localIdX, i16 %localIdY, i16 %localIdZ)
 ; CHECK-NOT:    define i32 @foo(i32 %x)

IGC/Compiler/tests/AddImplicitArgs/signatiure_changed_LocaIdsl.ll

@@ -20,9 +20,9 @@ define i32 @foo(i32 %x) nounwind {
 !2 =  !{ !"function_type", i32 0}
 !3 =  !{ !"arg_desc"}
 !4 =  !{ !"implicit_arg_desc",  !6,  !7,  !8}
-!6 =  !{i32 7}
-!7 =  !{i32 8}
-!8 =  !{i32 9}
+!6 =  !{i32 8}
+!7 =  !{i32 9}
+!8 =  !{i32 10}
 
 ; CHECK:         define i32 @foo(i32 %x, i16 %localIdX, i16 %localIdY, i16 %localIdZ)
 ; CHECK-NOT:    define i32 @foo(i32 %x)

IGC/Compiler/tests/AddImplicitArgs/signatiure_changed_NumWorkGroups-typed-pointers.ll

@@ -19,7 +19,7 @@ define i32 @foo(i32 %x) nounwind {
 !2 =  !{ !"function_type", i32 0}
 !3 =  !{ !"arg_desc"}
 !4 =  !{ !"implicit_arg_desc",  !6}
-!6 =  !{i32 3}
+!6 =  !{i32 4}
 
 ; CHECK:         define i32 @foo(i32 %x, <3 x i32> %numWorkGroups)
 ; CHECK-NOT:    define i32 @foo(i32 %x)

IGC/Compiler/tests/AddImplicitArgs/signatiure_changed_NumWorkGroups.ll

@@ -20,7 +20,7 @@ define i32 @foo(i32 %x) nounwind {
 !2 =  !{ !"function_type", i32 0}
 !3 =  !{ !"arg_desc"}
 !4 =  !{ !"implicit_arg_desc",  !6}
-!6 =  !{i32 3}
+!6 =  !{i32 4}
 
 ; CHECK:         define i32 @foo(i32 %x, <3 x i32> %numWorkGroups)
 ; CHECK-NOT:    define i32 @foo(i32 %x)