Merge pull request #76236 from swiftlang/revert-75436-susmonteiro/cxx-span-benchmarks

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

Author: ahoppen

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

@@ -4,26 +4,11 @@
 #include <vector>
 #include <set>
 
-// FIXME swift-ci linux tests do not support std::span
-#if __has_include(<span>)
-#include <span>
-#endif
-
-static const size_t spanSize = 50000;
-
-using ArrayOfU32 = uint32_t[spanSize];
 using VectorOfU32 = std::vector<uint32_t>;
 using SetOfU32 = std::set<uint32_t>;
-#if __has_include(<span>)
-using SpanOfU32 = std::span<uint32_t>;
-#endif
 
-static inline ArrayOfU32 array;
 static inline VectorOfU32 vec;
 static inline SetOfU32 set;
-#if __has_include(<span>)
-static inline SpanOfU32 span;
-#endif
 
 inline void initVector(size_t size) {
     if (!vec.empty()) {
@@ -44,18 +29,6 @@ inline void initSet(size_t size) {
     }
 }
 
-#if __has_include(<span>)
-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/CxxTests/CxxStdlibPerformance.h

@@ -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)