Fix handling genx volatile ptr as a function argument in VC

vsemenov368 · igcbot · commit 3c14f88a4788 · 2025-03-05T01:41:44.000+01:00
.
diff --git a/IGC/VectorCompiler/lib/Utils/GenX/TransformArgCopy.cpp b/IGC/VectorCompiler/lib/Utils/GenX/TransformArgCopy.cpp
@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2022-2024 Intel Corporation
+Copyright (C) 2022-2025 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -360,7 +360,7 @@ vc::OrigArgInfo::OrigArgInfo(Type *TyIn, ArgKind KindIn, int NewIdxIn)
     : TransformedOrigType{TyIn}, Kind{KindIn}, NewIdx{NewIdxIn} {
   IGC_ASSERT_MESSAGE(TyIn, "Bad type provided");
   IGC_ASSERT_MESSAGE(NewIdxIn == OmittedIdx || NewIdxIn >= 0,
-                     "Undexpected new index");
+                     "Unexpected new index");
 }
 
 int vc::OrigArgInfo::getNewIdx() const {
@@ -573,10 +573,21 @@ getTransformedFuncCallArgs(CallInst &OrigCall,
     default: {
       IGC_ASSERT_MESSAGE(Kind == ArgKind::CopyIn || Kind == ArgKind::CopyInOut,
                          "unexpected arg kind");
-      LoadInst *Load =
-          new LoadInst(OrigArgData.getTransformedOrigType(), OrigArg.get(),
-                       OrigArg.get()->getName() + ".val",
-                       /* isVolatile */ false, &OrigCall);
+
+      IRBuilder<> Builder(&OrigCall);
+
+      auto *Arg = OrigArg.get();
+      Value *Load = nullptr;
+      if (auto *G = dyn_cast<GlobalVariable>(Arg);
+          G && G->hasAttribute("genx_volatile")) {
+        auto *Fn = GenXIntrinsic::getGenXDeclaration(
+            G->getParent(), GenXIntrinsic::genx_vload,
+            {OrigArgData.getTransformedOrigType(), G->getType()});
+        Load = Builder.CreateCall(Fn, G, Arg->getName() + ".val");
+      } else {
+        Load = Builder.CreateLoad(OrigArgData.getTransformedOrigType(), Arg,
+                                  Arg->getName() + ".val");
+      }
       NewCallOps.push_back(Load);
       break;
     }
@@ -645,15 +656,26 @@ static void handleRetValuePortion(int RetIdx, RetToArgLink ArgInfo,
     IGC_ASSERT_MESSAGE(
         Kind == GlobalArgKind::ByValueInOut,
         "only passed by value localized global should be copied-out");
-    Builder.CreateStore(
-        OutVal, NewFuncInfo.getGlobalArgsInfo().getGlobalForArgNo(NewIdx));
+    auto *G = NewFuncInfo.getGlobalArgsInfo().getGlobalForArgNo(NewIdx);
+    IGC_ASSERT_MESSAGE(!G->hasAttribute("genx_volatile"),
+                       "genx_volatile is not expected");
+    Builder.CreateStore(OutVal, G);
   } else {
     // Use orig index: working with orig call's argument
     int OrigArgIdx = ArgInfo.getOrigIdx();
     auto Kind = NewFuncInfo.getOrigArgInfo()[OrigArgIdx].getKind();
     IGC_ASSERT_MESSAGE(Kind == ArgKind::CopyInOut || Kind == ArgKind::CopyOut,
                        "only copy (in-)out args are expected");
-    Builder.CreateStore(OutVal, OrigCall.getArgOperand(OrigArgIdx));
+    auto *Arg = OrigCall.getArgOperand(OrigArgIdx);
+    if (auto *G = dyn_cast<GlobalVariable>(Arg);
+        G && G->hasAttribute("genx_volatile")) {
+      auto *Fn = GenXIntrinsic::getGenXDeclaration(
+          G->getParent(), GenXIntrinsic::genx_vstore,
+          {OutVal->getType(), G->getType()});
+      Builder.CreateCall(Fn, {OutVal, G});
+    } else {
+      Builder.CreateStore(OutVal, Arg);
+    }
   }
 }
 
@@ -782,7 +804,7 @@ static Value *passGlobalAsCallArg(GlobalArgInfo GAI, CallInst &OrigCall) {
   // No additional work when addrspaces match
   if (GVTy->getAddressSpace() == vc::AddrSpace::Private)
     return GAI.GV;
-  // Need to add a temprorary cast inst to match types.
+  // Need to add a temporary cast inst to match types.
   // When this switch to the caller, it'll remove this cast.
   return new AddrSpaceCastInst{
       GAI.GV, vc::changeAddrSpace(GVTy, vc::AddrSpace::Private),
@@ -961,9 +983,9 @@ std::vector<Value *> vc::FuncBodyTransfer::handleTransformedFuncArgs() {
         if (Replacement->getType() == OrigArg.getType())
           return Replacement;
         IGC_ASSERT_MESSAGE(isa<PointerType>(Replacement->getType()),
-                           "only pointers can posibly mismatch");
+                           "only pointers can possibly mismatch");
         IGC_ASSERT_MESSAGE(isa<PointerType>(OrigArg.getType()),
-                           "only pointers can posibly mismatch");
+                           "only pointers can possibly mismatch");
         IGC_ASSERT_MESSAGE(
             Replacement->getType()->getPointerAddressSpace() !=
                 OrigArg.getType()->getPointerAddressSpace(),
diff --git a/IGC/VectorCompiler/test/CMABI/global_arg.ll b/IGC/VectorCompiler/test/CMABI/global_arg.ll
@@ -0,0 +1,62 @@
+;=========================== begin_copyright_notice ============================
+;
+; Copyright (C) 2025 Intel Corporation
+;
+; SPDX-License-Identifier: MIT
+;
+;============================ end_copyright_notice =============================
+
+; RUN: %opt_typed_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mcpu=XeHPG -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_opaque_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mcpu=XeHPG -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+
+; RUN: %opt_new_pm_typed -passes=CMABI -march=genx64 -mcpu=XeHPG -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=CMABI -march=genx64 -mcpu=XeHPG -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+
+; CHECK: [[GV:@[^ ]+]] = internal global <32 x i8> undef #0
+; CHECK: [[G:@[^ ]+]] = internal global <32 x i8> undef #1
+@gv = internal global <32 x i8> undef #0
+@g = internal global <32 x i8> undef #1
+
+; CHECK: define internal spir_func <32 x i8> @bar(<32 x i8> [[ARG:%[^ ]+]], <32 x i8> %data) {
+define internal spir_func void @bar(<32 x i8>* %arg, <32 x i8> %data) {
+; CHECK: [[ALLOCA:%[^ ]+]] = alloca <32 x i8>, align 32
+; CHECK-TYPED-PTRS: store <32 x i8> [[ARG]], <32 x i8>* [[ALLOCA]], align 32
+; CHECK-TYPED-PTRS: store <32 x i8> %data, <32 x i8>* [[ALLOCA]], align 1
+; CHECK-TYPED-PTRS: [[LOAD:%[^ ]+]] = load <32 x i8>, <32 x i8>* [[ALLOCA]], align 32
+; CHECK-OPAQUE-PTRS: store <32 x i8> [[ARG]], ptr [[ALLOCA]], align 32
+; CHECK-OPAQUE-PTRS: store <32 x i8> %data, ptr [[ALLOCA]], align 1
+; CHECK-OPAQUE-PTRS: [[LOAD:%[^ ]+]] = load <32 x i8>, ptr [[ALLOCA]], align 32
+; CHECK: ret <32 x i8> [[LOAD]]
+
+  store <32 x i8> %data, <32 x i8>* %arg, align 1
+  ret void
+}
+
+; CHECK-LABEL: @test_genx_volatile
+define void @test_genx_volatile(<32 x i8> %arg) {
+; CHECK-TYPED-PTRS: [[LOAD:%[^ ]+]] = call <32 x i8> @llvm.genx.vload.v32i8.p0v32i8(<32 x i8>* [[GV]])
+; CHECK-OPAQUE-PTRS: [[LOAD:%[^ ]+]] = call <32 x i8> @llvm.genx.vload.v32i8.p0(ptr [[GV]])
+; CHECK: [[RET:%[^ ]+]] = call spir_func <32 x i8> @bar(<32 x i8> [[LOAD]], <32 x i8> %arg)
+; CHECK-TYPED-PTRS: call void @llvm.genx.vstore.v32i8.p0v32i8(<32 x i8> [[RET]], <32 x i8>* [[GV]])
+; CHECK-OPAQUE-PTRS: call void @llvm.genx.vstore.v32i8.p0(<32 x i8> [[RET]], ptr [[GV]])
+
+  call spir_func void @bar(<32 x i8>* @gv, <32 x i8> %arg)
+  ret void
+}
+
+; CHECK-LABEL: @test_genx_none_volatile
+define void @test_genx_none_volatile(<32 x i8> %arg) {
+; CHECK: [[ALLOCA:%[^ ]+]] = alloca <32 x i8>, align 1
+; CHECK-TYPED-PTRS: [[LOAD:%[^ ]+]] = load <32 x i8>, <32 x i8>* [[ALLOCA]], align 32
+; CHECK-OPAQUE-PTRS: [[LOAD:%[^ ]+]] = load <32 x i8>, ptr [[ALLOCA]], align 32
+; CHECK: [[RET:%[^ ]+]] = call spir_func <32 x i8> @bar(<32 x i8> [[LOAD]], <32 x i8> %arg)
+; CHECK-TYPED-PTRS: store <32 x i8> [[RET]], <32 x i8>* [[ALLOCA]], align 32
+; CHECK-OPAQUE-PTRS: store <32 x i8> [[RET]], ptr [[ALLOCA]], align 32
+
+  call spir_func void @bar(<32 x i8>* @g, <32 x i8> %arg)
+  ret void
+}
+
+
+attributes #0 = { "genx_volatile" }
+attributes #1 = { "VCGlobalVariable" }
