fix

Author: sumesh-s-mcw

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -920,7 +920,7 @@ static void addOpDecorateReqs(const MachineInstr &MI, unsigned DecIndex,
   } else if (Dec == SPIRV::Decoration::FPMaxErrorDecorationINTEL) {
     Reqs.addRequirements(SPIRV::Capability::FPMaxErrorINTEL);
     Reqs.addExtension(SPIRV::Extension::SPV_INTEL_fp_max_error);
-  }else if (Dec == SPIRV::Decoration::MathOpDSPModeINTEL) {
+  } else if (Dec == SPIRV::Decoration::MathOpDSPModeINTEL) {
     Reqs.addExtension(SPIRV::Extension::Extension::SPV_INTEL_fpga_dsp_control);
   }
 }
@@ -1977,6 +1977,7 @@ static void handleMIFlagDecoration(MachineInstr &I, const SPIRVSubtarget &ST,
   Register DstReg = I.getOperand(0).getReg();
   buildOpDecorate(DstReg, I, TII, SPIRV::Decoration::FPFastMathMode, {FMFlags});
 }
+
 static std::vector<uint32_t>
 getMetaDataValues(std::vector<llvm::MDNode *> &MetaDataList) {
   std::vector<uint32_t> res;
@@ -1998,23 +1999,10 @@ getMetaDataValues(std::vector<llvm::MDNode *> &MetaDataList) {
 static void handleFunctionDecoration(llvm::Module::const_iterator F,
                                      const SPIRVInstrInfo &TII,
                                      MachineModuleInfo *MMI,
-                                     const SPIRVSubtarget &ST) {
-
-  MachineFunction *MF = MMI->getMachineFunction(*F);
-  Register Des = Register();
-  MachineInstr *curr = nullptr;
-
-  for (auto &MBB : *MF) {
-    for (auto &MI : MBB) {
-      if (MI.getOpcode() == SPIRV::OpFunction) {
-        if (MI.getNumOperands() > 0 && MI.getOperand(0).isReg()) {
-          Des = MI.getOperand(0).getReg();
-          curr = &MI;
-        }
-      }
-    }
-  }
-
+                                     const SPIRVSubtarget &ST,
+                                     MachineInstr &MI) {
+  Register Des = MI.getOperand(0).getReg();
+  MachineInstr *curr = &MI;
   // dsp controll
   if (llvm::MDNode *Node = F->getMetadata("prefer_dsp")) {
     std::vector<llvm::MDNode *> MetaDataList;
@@ -2024,25 +2012,29 @@ static void handleFunctionDecoration(llvm::Module::const_iterator F,
     if (ST.canUseExtension(
             SPIRV::Extension::Extension::SPV_INTEL_fpga_dsp_control)) {
       std::vector<uint32_t> params = getMetaDataValues(MetaDataList);
-      params.push_back(0);
+      if (params.size() == 1)
+        params.push_back(0);
       buildOpDecorate(Des, *curr, TII, SPIRV::Decoration::MathOpDSPModeINTEL,
                       params);
     }
   }
 }
 
-// Walk all functions and add decorations related to MI flags.
+// Walk all functions and add decorations related to MI flags and function metadata.
 static void addDecorations(const Module &M, const SPIRVInstrInfo &TII,
                            MachineModuleInfo *MMI, const SPIRVSubtarget &ST,
                            SPIRV::ModuleAnalysisInfo &MAI) {
   for (auto F = M.begin(), E = M.end(); F != E; ++F) {
     MachineFunction *MF = MMI->getMachineFunction(*F);
     if (!MF)
       continue;
-    for (auto &MBB : *MF)
-      for (auto &MI : MBB)
+    for (auto &MBB : *MF) {
+      for (auto &MI : MBB) {
+        if (MI.getOpcode() == SPIRV::OpFunction)
+          handleFunctionDecoration(F, TII, MMI, ST, MI);
         handleMIFlagDecoration(MI, ST, TII, MAI.Reqs);
-    handleFunctionDecoration(F, TII, MMI, ST);
+      }
+    }
   }
 }