Tweaking types held in attribute lists of call instructions

This change is to attach correct attribute lists to new call instructions in `PromoteBools`. The attribute list must contain promoted types to be in sync with their called function.

(cherry picked from commit 07a4be8)

Author: krystian-andrzejewski

IGC/AdaptorOCL/preprocess_spvir/PromoteBools.cpp

@@ -530,13 +530,14 @@ Value* PromoteBools::getOrCreatePromotedValue(Value* value)
     return newValue;
 }
 
-void PromoteBools::setPromotedAttributes(Function* newFunction, AttributeList& attributeList)
+template<typename T>
+void PromoteBools::setPromotedAttributes(T* newCallOrFunc, const AttributeList& attributeList)
 {
-    auto getPromoted = [this, &newFunction](llvm::Attribute attr)
+    auto getPromoted = [this, &newCallOrFunc](llvm::Attribute attr)
         {
             if (attr.isTypeAttribute())
             {
-                return attr.getWithNewType(newFunction->getContext(),
+                return attr.getWithNewType(newCallOrFunc->getContext(),
                     getOrCreatePromotedType(attr.getValueAsType()));
             }
             else
@@ -546,35 +547,28 @@ void PromoteBools::setPromotedAttributes(Function* newFunction, AttributeList& a
         };
 
     // set function attributes
-    AttrBuilder attrBuilder(newFunction->getContext());
     for (const auto& attr : attributeList.getFnAttrs())
     {
-        attrBuilder.addAttribute(getPromoted(attr));
+        newCallOrFunc->addFnAttr(getPromoted(attr));
     }
-    newFunction->addFnAttrs(attrBuilder);
 
-    // set return attributes
-    attrBuilder.clear();
-    for (const auto &attr : attributeList.getRetAttrs())
+    for (const auto& attr : attributeList.getRetAttrs())
     {
-        attrBuilder.addAttribute(getPromoted(attr));
+        newCallOrFunc->addRetAttr(getPromoted(attr));
     }
-    newFunction->addRetAttrs(attrBuilder);
 
     // set params' attributes
-    for (size_t i = 0; i < newFunction->arg_size(); i++)
+    for (size_t i = 0; i < newCallOrFunc->arg_size(); i++)
     {
         if (!attributeList.hasParamAttrs(i))
         {
             continue;
         }
 
-        attrBuilder.clear();
         for (const auto& attr : attributeList.getParamAttrs(i))
         {
-            attrBuilder.addAttribute(getPromoted(attr));
+            newCallOrFunc->addParamAttr(i, getPromoted(attr));
         }
-        newFunction->addParamAttrs(i, attrBuilder);
     }
 }
 
@@ -895,7 +889,7 @@ CallInst* PromoteBools::promoteIndirectCallOrInlineAsm(CallInst* call)
         call
     );
     newCall->setCallingConv(call->getCallingConv());
-    newCall->setAttributes(call->getAttributes());
+    setPromotedAttributes(newCall, call->getAttributes());
     newCall->setDebugLoc(call->getDebugLoc());
     return newCall;
 }
@@ -968,7 +962,7 @@ CallInst* PromoteBools::promoteCall(CallInst* call)
         call
     );
     newCall->setCallingConv(call->getCallingConv());
-    newCall->setAttributes(call->getAttributes());
+    setPromotedAttributes(newCall, call->getAttributes());
     newCall->setDebugLoc(call->getDebugLoc());
     return newCall;
 }

IGC/AdaptorOCL/preprocess_spvir/PromoteBools.h

@@ -77,7 +77,8 @@ namespace IGC
             });
         }
 
-        void setPromotedAttributes(llvm::Function* newFunction, llvm::AttributeList& attributeList);
+        template<typename T>
+        void setPromotedAttributes(T* callOrFunc, const llvm::AttributeList& attributeList);
 
         llvm::Value* getOrCreatePromotedValue(llvm::Value* value);
         llvm::Function* promoteFunction(llvm::Function* function);

IGC/Compiler/tests/PromoteBools/promote_attrs.ll

@@ -14,6 +14,12 @@
 
 %struct = type { [4 x <8 x i1*>], [4 x <8 x i1>*]* }
 
+define spir_func void @entry() {
+  %a = alloca %struct, align 8
+  call void @prom_attr(%struct* byval(%struct) align 8 %a)
+  ret void
+}
+
 define spir_func void @prom_attr(%struct* byval(%struct) align 8 %0) {
   ret void
 }