Fix type usage in the named barriers

Fix type usage in the named barriers

Author: lwesiers

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -16156,23 +16156,18 @@ void EmitPass::emitTypedWrite(llvm::Instruction* pInsn)
 
 void EmitPass::emitThreadGroupNamedBarriersSignal(llvm::Instruction* inst)
 {
-    CVariable* barrierID = m_currShader->ImmToVariable(
-        cast<llvm::ConstantInt>(inst->getOperand(0))->getSExtValue(), ISA_TYPE_UD);
-    CVariable* barrierType = m_currShader->ImmToVariable(
-        cast<llvm::ConstantInt>(inst->getOperand(1))->getSExtValue(), ISA_TYPE_UW);
-    CVariable* producerCnt = m_currShader->ImmToVariable(
-        cast<llvm::ConstantInt>(inst->getOperand(2))->getSExtValue(), ISA_TYPE_UD);
-    CVariable* consumerCnt = m_currShader->ImmToVariable(
-        cast<llvm::ConstantInt>(inst->getOperand(3))->getSExtValue(), ISA_TYPE_UD);
+    CVariable* barrierID = m_currShader->GetSymbol(inst->getOperand(0));
+    CVariable* barrierType = m_currShader->GetSymbol(inst->getOperand(1));
+    CVariable* producerCnt = m_currShader->GetSymbol(inst->getOperand(2));
+    CVariable* consumerCnt = m_currShader->GetSymbol(inst->getOperand(3));
     m_encoder->NamedBarrier(EBARRIER_SIGNAL, barrierID, barrierType, producerCnt, consumerCnt);
 
     m_encoder->Push();
 }
 
 void EmitPass::emitThreadGroupNamedBarriersWait(llvm::Instruction* inst)
 {
-    CVariable* barrierID = m_currShader->ImmToVariable(
-        cast<llvm::ConstantInt>(inst->getOperand(0))->getSExtValue(), ISA_TYPE_UD);
+    CVariable* barrierID = m_currShader->GetSymbol(inst->getOperand(0));
 
     m_encoder->NamedBarrier(EBARRIER_WAIT, barrierID, nullptr, nullptr, nullptr);
     m_encoder->Push();

IGC/Compiler/Optimizer/OpenCLPasses/NamedBarriers/NamedBarriersResolution.cpp

@@ -212,9 +212,10 @@ void NamedBarriersResolution::HandleNamedBarrierInitHW(CallInst& NBarrierInitCal
 #ifndef VK_ONLY_IGC
     m_CountNamedBarriers++;
     IGC_ASSERT_MESSAGE(m_CountNamedBarriers <= GetMaxNamedBarriers(), "NamedBarriersResolution : We crossed the max of amount of named barriers!");
-    Module* module = NBarrierInitCall.getModule();
 
-    Value* threadGroupNBarrierID = (Value*)getInt32(module, m_CountNamedBarriers);
+    IGCLLVM::IRBuilder<> builder(&NBarrierInitCall);
+
+    Value* threadGroupNBarrierID = builder.getInt8(m_CountNamedBarriers);
     Value* pointerToNBarrierStruct = FindAllocStructNBarrier((Value*)(&NBarrierInitCall), true);
 
     s_namedBarrierInfo structNb;

IGC/GenISAIntrinsics/generator/input/Intrinsic_definitions.yml

@@ -9841,19 +9841,19 @@ intrinsics:
         arguments:
             - !<ArgumentDefinition>
                 name: Arg0
-                type_definition: *i32
+                type_definition: *i8
                 comment: "thread group named barrier ID"
             - !<ArgumentDefinition>
                 name: Arg1
                 type_definition: *i16
                 comment: "barrier type (ProducerConsumer = 0, Producer = 1, Consumer = 2)"
             - !<ArgumentDefinition>
                 name: Arg2
-                type_definition: *i32
+                type_definition: *i8
                 comment: "Producer count"
             - !<ArgumentDefinition>
                 name: Arg3
-                type_definition: *i32
+                type_definition: *i8
                 comment: "Consumer count"
         attributes:
             - !AttributeID "Convergent"
@@ -9867,7 +9867,7 @@ intrinsics:
         arguments:
             - !<ArgumentDefinition>
                 name: Arg0
-                type_definition: *i32
+                type_definition: *i8
                 comment: "thread group named barrier ID"
         attributes:
             - !AttributeID "Convergent"