Revert "[cxx-interop] Create benchmarks for using std::span in Swift"

benchmark/CMakeLists.txt

@@ -214,7 +214,6 @@ set(SWIFT_BENCH_MODULES
     cxx-source/CxxVectorSum
     # TODO: rdar://92120528
     # cxx-source/ReadAccessor
-    cxx-source/CxxSpanTests
 )
 
 set(SWIFT_MULTISOURCE_SWIFT_BENCHES

benchmark/cxx-source/CxxSpanTests.swift

@@ -1,121 +0,0 @@
-//===--- CxxSpanTests.swift ----------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import TestsUtils
-import CxxStdlibPerformance
-
-let iterRepeatFactor = 7
-
-// FIXME swift-ci linux tests do not support std::span
-#if os(Linux)
-public let benchmarks = [BenchmarkInfo]()
-#else
-
-public let benchmarks = [
-  BenchmarkInfo(
-    name: "CxxSpanTests.raw.iterator",
-    runFunction: run_CxxSpanOfU32_RawIterator,
-    tags: [.validation, .bridging, .cxxInterop],
-    setUpFunction: makeSpanOnce),
-  BenchmarkInfo(
-    name: "CxxSpanTests.index.subscript",
-    runFunction: run_CxxSpanOfU32_IndexAndSubscript,
-    tags: [.validation, .bridging, .cxxInterop],
-    setUpFunction: makeSpanOnce),
-  BenchmarkInfo(
-    name: "CxxSpanTests.for.loop",
-    runFunction: run_CxxSpanOfU32_ForInLoop,
-    tags: [.validation, .bridging, .cxxInterop],
-    setUpFunction: makeSpanOnce),
-  BenchmarkInfo(
-    name: "CxxSpanTests.map",
-    runFunction: run_CxxSpanOfU32_MapSpan,
-    tags: [.validation, .bridging, .cxxInterop],
-    setUpFunction: makeSpanOnce),
-  BenchmarkInfo(
-    name: "CxxSpanTests.filter",
-    runFunction: run_CxxSpanOfU32_FilterSpan,
-    tags: [.validation, .bridging, .cxxInterop],
-    setUpFunction: makeSpanOnce),
-  BenchmarkInfo(
-    name: "CxxSpanTests.reduce",
-    runFunction: run_CxxSpanOfU32_ReduceSpan,
-    tags: [.validation, .bridging, .cxxInterop],
-    setUpFunction: makeSpanOnce),
-]
-
-func makeSpanOnce() {
-  initSpan()
-}
-
-@inline(never)
-public func run_CxxSpanOfU32_RawIterator(_ n: Int) {
-  var sum: UInt32 = 0
-  for _ in 0..<(n * iterRepeatFactor * 2) {
-    var b = span.__beginUnsafe()
-    let e = span.__endUnsafe()
-    while b != e {
-      sum = sum &+ b.pointee
-      b = b.successor()
-    }
-  }
-  blackHole(sum)
-}
-
-@inline(never)
-public func run_CxxSpanOfU32_IndexAndSubscript(_ n: Int) {
-  var sum: UInt32 = 0
-  for _ in 0..<(n * iterRepeatFactor * 2) {
-    for i in 0..<span.size() {
-      sum = sum &+ span[i]
-    }
-  }
-  blackHole(sum)
-}
-
-@inline(never)
-public func run_CxxSpanOfU32_ForInLoop(_ n: Int) {
-  var sum: UInt32 = 0
-  for _ in 0..<(n * iterRepeatFactor * 2) {
-    for x in span {
-      sum = sum &+ x
-    }
-  }
-  blackHole(sum)
-}
-
-@inline(never)
-public func run_CxxSpanOfU32_MapSpan(_ n: Int) {
-  for _ in 0..<(n * iterRepeatFactor) {
-    let result = span.map { $0 &+ 5 }
-    blackHole(result)
-  }
-}
-
-@inline(never)
-public func run_CxxSpanOfU32_FilterSpan(_ n: Int) {
-  for _ in 0..<(n * iterRepeatFactor) {
-    let result = span.filter { $0 % 2 == 0 }
-    blackHole(result)
-  }
-}
-
-@inline(never)
-public func run_CxxSpanOfU32_ReduceSpan(_ n: Int) {
-  var sum: UInt32 = 0
-  for _ in 0..<(n * iterRepeatFactor * 2) {
-    sum = sum &+ span.reduce(sum, &+)
-  }
-  blackHole(sum)
-}
-
-#endif

benchmark/utils/CxxTests/CxxStdlibPerformance.h

@@ -4,29 +4,11 @@
 #include <vector>
 #include <set>
 
-// FIXME swift-ci linux tests do not support std::span
-#if defined(__has_include) && __has_include(<span>)
-#include <span>
-#define SPAN_DEFINED 1
-#else
-#define SPAN_DEFINED 0
-#endif
-
-static const size_t spanSize = 50000;
-
 using VectorOfU32 = std::vector<uint32_t>;
 using SetOfU32 = std::set<uint32_t>;
-#if SPAN_DEFINED
-using ArrayOfU32 = uint32_t[spanSize];
-using SpanOfU32 = std::span<uint32_t>;
-#endif
 
 static inline VectorOfU32 vec;
 static inline SetOfU32 set;
-#if SPAN_DEFINED
-static inline ArrayOfU32 array;
-static inline SpanOfU32 span;
-#endif
 
 inline void initVector(size_t size) {
     if (!vec.empty()) {
@@ -47,18 +29,6 @@ inline void initSet(size_t size) {
     }
 }
 
-#if SPAN_DEFINED
-inline void initSpan() {
-    if (!span.empty()) {
-        return;
-    }
-    for (size_t i = 0; i < spanSize; ++i) {
-        array[i] = uint32_t(i);
-    }
-    span = SpanOfU32(array);
-}
-#endif
-
 inline VectorOfU32 makeVector32(size_t size) {
     initVector(size);
     return vec;

benchmark/utils/main.swift

@@ -60,7 +60,6 @@ import CreateObjects
 import CxxStringConversion
 // rdar://128520766
 // import CxxVectorSum
-import CxxSpanTests
 import DataBenchmarks
 import DeadArray
 import DevirtualizeProtocolComposition
@@ -259,7 +258,6 @@ register(CreateObjects.benchmarks)
 register(CxxStringConversion.benchmarks)
 // rdar://128520766
 // register(CxxVectorSum.benchmarks)
-register(CxxSpanTests.benchmarks)
 register(DataBenchmarks.benchmarks)
 register(DeadArray.benchmarks)
 register(DevirtualizeProtocolComposition.benchmarks)