Merge pull request swiftlang#33024 from gottesmm/pr-5c5c78e98bdffbe1da91f38512d5c62904b8a68b

[opt-remark] Teach arg inference how to handle simple loads from globals.

Author: gottesmm

lib/SIL/Utils/OptimizationRemark.cpp

@@ -21,6 +21,8 @@
 #include "swift/AST/DiagnosticsSIL.h"
 #include "swift/Demangling/Demangler.h"
 #include "swift/SIL/DebugUtils.h"
+#include "swift/SIL/InstructionUtils.h"
+#include "swift/SIL/MemAccessUtils.h"
 #include "swift/SIL/SILArgument.h"
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SIL/SILRemarkStreamer.h"
@@ -78,23 +80,37 @@ Argument::Argument(StringRef key, CanType ty)
 bool Argument::inferArgumentsForValue(
     ArgumentKeyKind keyKind, StringRef msg, SILValue value,
     function_ref<bool(Argument)> funcPassedInferedArgs) {
-  // If we have an argument, just use that.
-  if (auto *arg = dyn_cast<SILArgument>(value))
-    if (auto *decl = arg->getDecl())
-      return funcPassedInferedArgs(
-          Argument({keyKind, "InferredValue"}, msg, decl));
-
-  // TODO: Look for loads from globals and addresses.
-
-  // Otherwise, look for debug_values.
-  for (auto *use : getDebugUses(value))
-    if (auto *dvi = dyn_cast<DebugValueInst>(use->getUser()))
-      if (auto *decl = dvi->getDecl())
+
+  while (true) {
+    // If we have an argument, just use that.
+    if (auto *arg = dyn_cast<SILArgument>(value))
+      if (auto *decl = arg->getDecl())
+        return funcPassedInferedArgs(
+            Argument({keyKind, "InferredValue"}, msg, decl));
+
+    // Otherwise, look for debug_values.
+    for (auto *use : getDebugUses(value))
+      if (auto *dvi = dyn_cast<DebugValueInst>(use->getUser()))
+        if (auto *decl = dvi->getDecl())
+          if (!funcPassedInferedArgs(
+                  Argument({keyKind, "InferredValue"}, msg, decl)))
+            return false;
+
+    // If we have a load, look through it and continue. We may have a global or
+    // a function argument.
+    if (auto *li = dyn_cast<LoadInst>(value)) {
+      value = stripAccessMarkers(li->getOperand());
+      continue;
+    }
+
+    if (auto *ga = dyn_cast<GlobalAddrInst>(value))
+      if (auto *decl = ga->getReferencedGlobal()->getDecl())
         if (!funcPassedInferedArgs(
                 Argument({keyKind, "InferredValue"}, msg, decl)))
           return false;
 
-  return true;
+    return true;
+  }
 }
 
 template <typename DerivedT>

test/SILOptimizer/opt-remark-generator.swift

@@ -7,29 +7,31 @@
 // CHECK-NEXT: Pass:            sil-opt-remark-gen
 // CHECK-NEXT: Name:            sil.memory-management
 // CHECK-NEXT: DebugLoc:        { File: '{{.*}}opt-remark-generator.swift', 
-// CHECK-NEXT:                    Line: 57, Column: 5 }
+// CHECK-NEXT:                    Line: 59, Column: 5 }
 // CHECK-NEXT: Function:        'getGlobal()'
 // CHECK-NEXT: Args:
 // CHECK-NEXT:   - String:          'Found retain:'
-// CHECK-NEXT:   - InferValueFailure: Unable to infer any values being retained.
+// CHECK-NEXT:   - InferredValue:   'on value:'
+// CHECK-NEXT:     DebugLoc:        { File: '{{.*}}opt-remark-generator.swift',
+// CHECK-NEXT:                        Line: 55, Column: 12 }
 // CHECK-NEXT: ...
 // CHECK-NEXT: --- !Missed
 // CHECK-NEXT: Pass:            sil-opt-remark-gen
 // CHECK-NEXT: Name:            sil.memory-management
 // CHECK-NEXT: DebugLoc:        { File: '{{.*}}opt-remark-generator.swift', 
-// CHECK-NEXT:                    Line: 65, Column: 5 }
+// CHECK-NEXT:                    Line: 67, Column: 5 }
 // CHECK-NEXT: Function:        'useGlobal()'
 // CHECK-NEXT: Args:
 // CHECK-NEXT:   - String:          'Found retain:'
 // CHECK-NEXT:   - InferredValue:   'on value:'
 // CHECK-NEXT:     DebugLoc:        { File: '{{.*}}opt-remark-generator.swift',
-// CHECK-NEXT:                        Line: 62, Column: 9 }
+// CHECK-NEXT:                        Line: 64, Column: 9 }
 // CHECK-NEXT: ...
 // CHECK-NEXT: --- !Missed
 // CHECK-NEXT: Pass:            sil-opt-remark-gen
 // CHECK-NEXT: Name:            sil.memory-management
 // CHECK-NEXT: DebugLoc:        { File: '{{.*}}opt-remark-generator.swift', 
-// CHECK-NEXT:                    Line: 65, Column: 12 }
+// CHECK-NEXT:                    Line: 67, Column: 12 }
 // CHECK-NEXT: Function:        'useGlobal()'
 // CHECK-NEXT: Args:
 // CHECK-NEXT:   - String:          'Found release:'
@@ -39,13 +41,13 @@
 // CHECK-NEXT: Pass:            sil-opt-remark-gen
 // CHECK-NEXT: Name:            sil.memory-management
 // CHECK-NEXT: DebugLoc:        { File: '{{.*}}opt-remark-generator.swift', 
-// CHECK-NEXT:                    Line: 65, Column: 12 }
+// CHECK-NEXT:                    Line: 67, Column: 12 }
 // CHECK-NEXT: Function:        'useGlobal()'
 // CHECK-NEXT: Args:
 // CHECK-NEXT:   - String:          'Found release:'
 // CHECK-NEXT:   - InferredValue:   'on value:'
 // CHECK-NEXT:     DebugLoc:        { File: '{{.*}}opt-remark-generator.swift',
-// CHECK-NEXT:                        Line: 62, Column: 9 }
+// CHECK-NEXT:                        Line: 64, Column: 9 }
 // CHECK-NEXT: ...
 
 public class Klass {}
@@ -55,7 +57,7 @@ public var global = Klass()
 @inline(never)
 public func getGlobal() -> Klass {
     return global // expected-remark @:5 {{Found retain:}}
-                  // expected-note @-1:5 {{Unable to infer any values being retained.}}
+                  // expected-note @-5:12 {{on value:}}
 }
 
 public func useGlobal() {