[llvm] ccc11a9 - GlobalISel: Assume G_INTRINSIC* are convergent

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2020-02-05T10:17:22-08:00
New Revision: ccc11a9f3099ce8c3eeae69c382e54ac3339f00b

URL: https://github.com/llvm/llvm-project/commit/ccc11a9f3099ce8c3eeae69c382e54ac3339f00b
DIFF: https://github.com/llvm/llvm-project/commit/ccc11a9f3099ce8c3eeae69c382e54ac3339f00b.diff

LOG: GlobalISel: Assume G_INTRINSIC* are convergent

This is safer in case anyone tries to run MI optimization passes on
pre-selected MIR. If there turns out to be a real reason to do this,
we might need to add separate convergent intrinsic opcodes.

Added: 
    

Modified: 
    llvm/include/llvm/Target/GenericOpcodes.td

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Target/GenericOpcodes.td b/llvm/include/llvm/Target/GenericOpcodes.td
index 0ee9c3916c10..6e7531496efc 100644
--- a/llvm/include/llvm/Target/GenericOpcodes.td
+++ b/llvm/include/llvm/Target/GenericOpcodes.td
@@ -960,6 +960,10 @@ def G_INTRINSIC : GenericInstruction {
   let OutOperandList = (outs);
   let InOperandList = (ins unknown:$intrin, variable_ops);
   let hasSideEffects = 0;
+
+  // Conservatively assume this is convergent. If there turnes out to
+  // be a need, there should be separate convergent intrinsic opcode.s
+  let isConvergent = 1;
 }
 
 // Intrinsic with side effects.
@@ -969,6 +973,10 @@ def G_INTRINSIC_W_SIDE_EFFECTS : GenericInstruction {
   let hasSideEffects = 1;
   let mayLoad = 1;
   let mayStore = 1;
+
+  // Conservatively assume this is convergent. If there turnes out to
+  // be a need, there should be separate convergent intrinsic opcode.s
+  let isConvergent = 1;
 }
 
 //------------------------------------------------------------------------------