Merge pull request swiftlang#79699 from meg-gupta/prboundscheck

Add support for bounds check optimization of Span and InlineArray

Author: meg-gupta

include/swift/AST/SemanticAttrs.def

@@ -160,5 +160,8 @@ SEMANTICS_ATTR(DELETE_IF_UNUSED, "sil.optimizer.delete_if_unused")
 // Force the use of the frame pointer for the specified function
 SEMANTICS_ATTR(USE_FRAME_POINTER, "use_frame_pointer")
 
+SEMANTICS_ATTR(FIXED_STORAGE_CHECK_INDEX, "fixed_storage.check_index")
+SEMANTICS_ATTR(FIXED_STORAGE_GET_COUNT, "fixed_storage.get_count")
+
 #undef SEMANTICS_ATTR
 

include/swift/SIL/InstWrappers.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_SIL_WRAPPERTYPES_H
 #define SWIFT_SIL_WRAPPERTYPES_H
 
+#include "swift/SIL/SILFunction.h"
 #include "swift/SIL/SILInstruction.h"
 
 namespace swift {
@@ -361,6 +362,43 @@ class ForwardingOperation {
   // operation.
   bool visitForwardedValues(function_ref<bool(SILValue)> visitor);
 };
+
+enum class FixedStorageSemanticsCallKind { None, CheckIndex, GetCount };
+
+struct FixedStorageSemanticsCall {
+  ApplyInst *apply = nullptr;
+  FixedStorageSemanticsCallKind kind = FixedStorageSemanticsCallKind::None;
+
+  FixedStorageSemanticsCall(SILInstruction *input) {
+    auto *applyInst = dyn_cast<ApplyInst>(input);
+    if (!applyInst) {
+      return;
+    }
+    auto *callee = applyInst->getReferencedFunctionOrNull();
+    if (!callee) {
+      return;
+    }
+    for (auto &attr : callee->getSemanticsAttrs()) {
+      if (attr == "fixed_storage.check_index") {
+        apply = applyInst;
+        kind = FixedStorageSemanticsCallKind::CheckIndex;
+        break;
+      } else if (attr == "fixed_storage.get_count") {
+        apply = applyInst;
+        kind = FixedStorageSemanticsCallKind::GetCount;
+        break;
+      }
+    }
+  }
+
+  FixedStorageSemanticsCallKind getKind() const { return kind; }
+  explicit operator bool() const { return apply != nullptr; }
+  const ApplyInst *operator->() const { return apply; }
+  ApplyInst *operator->() { return apply; }
+};
+
+bool isFixedStorageSemanticsCallKind(SILFunction *function);
+
 } // end namespace swift
 
 #endif

include/swift/SILOptimizer/PassManager/Passes.def

@@ -86,8 +86,8 @@
 
 SWIFT_FUNCTION_PASS(AliasInfoDumper, "dump-alias-info",
      "Dump Alias Analysis over all Pairs")
-PASS(ABCOpt, "abcopts",
-     "Array Bounds Check Optimization")
+PASS(BoundsCheckOpts, "bcopts",
+     "Bounds Check Optimization")
 PASS(AccessEnforcementDom, "access-enforcement-dom",
      "Remove dominated access checks with no nested conflict")
 PASS(AccessEnforcementOpts, "access-enforcement-opts",

lib/SIL/IR/SILInstruction.cpp

@@ -1448,11 +1448,11 @@ bool SILInstruction::isTriviallyDuplicatable() const {
   if (auto *PA = dyn_cast<PartialApplyInst>(this)) {
     return !PA->isOnStack();
   }
-  // Like partial_apply [onstack], mark_dependence [nonescaping] creates a
-  // borrow scope. We currently assume that a set of dominated scope-ending uses
-  // can be found.
+  // Like partial_apply [onstack], mark_dependence [nonescaping] on values
+  // creates a borrow scope. We currently assume that a set of dominated
+  // scope-ending uses can be found.
   if (auto *MD = dyn_cast<MarkDependenceInst>(this)) {
-    return !MD->isNonEscaping();
+    return !MD->isNonEscaping() || MD->getType().isAddress();
   }
 
   if (isa<OpenExistentialAddrInst>(this) || isa<OpenExistentialRefInst>(this) ||

lib/SIL/Utils/InstWrappers.cpp

@@ -99,3 +99,13 @@ bool ForwardingOperation::visitForwardedValues(
     return visitor(args[0]);
   });
 }
+
+bool swift::isFixedStorageSemanticsCallKind(SILFunction *function) {
+  for (auto &attr : function->getSemanticsAttrs()) {
+    if (attr == "fixed_storage.check_index" ||
+        attr == "fixed_storage.get_count") {
+      return true;
+    }
+  }
+  return false;
+}