[Builtin] Fix issue with attribute list update (#2192)

When adding changes to support fpbuiltins in the translator, there was a bug that overwrote some attributes.
This PR aims to fix that issue.

Signed-off-by: Arvind Sudarsanam <[email protected]>

Author: asudarsa

lib/SPIRV/SPIRVBuiltinHelper.cpp

@@ -103,7 +103,10 @@ Value *BuiltinCallMutator::doConversion() {
       Builder.Insert(addCallInst(CI->getModule(), FuncName, ReturnTy, Args,
                                  &Attrs, nullptr, Mangler.get()));
   NewCall->copyMetadata(*CI);
-  NewCall->setAttributes(CI->getAttributes());
+  if (CI->hasFnAttr("fpbuiltin-max-error")) {
+    auto Attr = CI->getFnAttr("fpbuiltin-max-error");
+    NewCall->addFnAttr(Attr);
+  }
   Value *Result = MutateRet ? MutateRet(Builder, NewCall) : NewCall;
   Result->takeName(CI);
   if (!CI->getType()->isVoidTy())

test/extensions/INTEL/SPV_INTEL_fp_max_error/IntelFPMaxError.ll

@@ -43,7 +43,6 @@
 ; CHECK-SPIRV: Name [[#T31:]] "t31"
 ; CHECK-SPIRV: Name [[#T32:]] "t32"
 ; CHECK-SPIRV: Name [[#T33:]] "t33"
-; CHECK-SPIRV: Name [[#T34:]] "t34"
 
 ; CHECK-SPIRV: Decorate [[#T3]] FPMaxErrorDecorationINTEL 1056964608
 ; CHECK-SPIRV: Decorate [[#T4]] FPMaxErrorDecorationINTEL 1065353216
@@ -75,8 +74,7 @@
 ; CHECK-SPIRV: Decorate [[#T30]] FPMaxErrorDecorationINTEL 1082130432
 ; CHECK-SPIRV: Decorate [[#T31]] FPMaxErrorDecorationINTEL 1082130432
 ; CHECK-SPIRV: Decorate [[#T32]] FPMaxErrorDecorationINTEL 1082130432
-; CHECK-SPIRV: Decorate [[#T33]] FPMaxErrorDecorationINTEL 1082130432
-; CHECK-SPIRV: Decorate [[#T34]] FPMaxErrorDecorationINTEL 1166016512
+; CHECK-SPIRV: Decorate [[#T33]] FPMaxErrorDecorationINTEL 1166016512
 
 ; CHECK-SPIRV: 3 TypeFloat [[#FTYPE:]] 32
 
@@ -113,7 +111,6 @@
 ; CHECK-SPIRV: ExtInst [[#FTYPE]] [[#T31]] [[#OCLEXTID]] ldexp
 ; CHECK-SPIRV: ExtInst [[#FTYPE]] [[#T32]] [[#OCLEXTID]] pow
 ; CHECK-SPIRV: ExtInst [[#FTYPE]] [[#T33]] [[#OCLEXTID]] hypot
-; CHECK-SPIRV: ExtInst [[#FTYPE]] [[#T34]] [[#OCLEXTID]] hypot
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
 target triple = "spir64-unknown-unknown"
@@ -189,14 +186,12 @@ entry:
 ; CHECK-LLVM: call spir_func float @_Z5atan2ff(float %f1, float %f2) #[[#AT4:]]
 ; CHECK-LLVM: call spir_func float @_Z5ldexpfi(float %f1, i32 %f4) #[[#AT4]]
 ; CHECK-LLVM: call spir_func float @_Z3powff(float %f1, float %f2) #[[#AT4]]
-; CHECK-LLVM: call spir_func float @_Z5hypotff(float %f1, float %f2) #[[#AT4]]
   %t30 = call float @llvm.fpbuiltin.atan2.f32(float %f1, float %f2) #3
   %t31 = call float @llvm.fpbuiltin.ldexp.f32.i32(float %f1, i32 %f4) #3
   %t32 = call float @llvm.fpbuiltin.pow.f32(float %f1, float %f2) #3
-  %t33 = call float @llvm.fpbuiltin.hypot.f32(float %f1, float %f2) #3
 
   ; CHECK-LLVM: call spir_func float @_Z5hypotff(float %f1, float %f2) #[[#AT5:]]
-  %t34 = call float @llvm.fpbuiltin.hypot.f32(float %f1, float %f2) #4
+  %t33 = call float @llvm.fpbuiltin.hypot.f32(float %f1, float %f2) #4
 
   ret void
 }