Skip to content

Commit 9c28427

Browse files
committed
Revert "[cxx-interop] Create benchmarks for using std::span in Swift"
1 parent 21d5a7d commit 9c28427

File tree

4 files changed

+0
-154
lines changed

4 files changed

+0
-154
lines changed

benchmark/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ set(SWIFT_BENCH_MODULES
214214
cxx-source/CxxVectorSum
215215
# TODO: rdar://92120528
216216
# cxx-source/ReadAccessor
217-
cxx-source/CxxSpanTests
218217
)
219218

220219
set(SWIFT_MULTISOURCE_SWIFT_BENCHES

benchmark/cxx-source/CxxSpanTests.swift

-121
This file was deleted.

benchmark/utils/CxxTests/CxxStdlibPerformance.h

-30
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,11 @@
44
#include <vector>
55
#include <set>
66

7-
// FIXME swift-ci linux tests do not support std::span
8-
#if defined(__has_include) && __has_include(<span>)
9-
#include <span>
10-
#define SPAN_DEFINED 1
11-
#else
12-
#define SPAN_DEFINED 0
13-
#endif
14-
15-
static const size_t spanSize = 50000;
16-
177
using VectorOfU32 = std::vector<uint32_t>;
188
using SetOfU32 = std::set<uint32_t>;
19-
#if SPAN_DEFINED
20-
using ArrayOfU32 = uint32_t[spanSize];
21-
using SpanOfU32 = std::span<uint32_t>;
22-
#endif
239

2410
static inline VectorOfU32 vec;
2511
static inline SetOfU32 set;
26-
#if SPAN_DEFINED
27-
static inline ArrayOfU32 array;
28-
static inline SpanOfU32 span;
29-
#endif
3012

3113
inline void initVector(size_t size) {
3214
if (!vec.empty()) {
@@ -47,18 +29,6 @@ inline void initSet(size_t size) {
4729
}
4830
}
4931

50-
#if SPAN_DEFINED
51-
inline void initSpan() {
52-
if (!span.empty()) {
53-
return;
54-
}
55-
for (size_t i = 0; i < spanSize; ++i) {
56-
array[i] = uint32_t(i);
57-
}
58-
span = SpanOfU32(array);
59-
}
60-
#endif
61-
6232
inline VectorOfU32 makeVector32(size_t size) {
6333
initVector(size);
6434
return vec;

benchmark/utils/main.swift

-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import CreateObjects
6060
import CxxStringConversion
6161
// rdar://128520766
6262
// import CxxVectorSum
63-
import CxxSpanTests
6463
import DataBenchmarks
6564
import DeadArray
6665
import DevirtualizeProtocolComposition
@@ -259,7 +258,6 @@ register(CreateObjects.benchmarks)
259258
register(CxxStringConversion.benchmarks)
260259
// rdar://128520766
261260
// register(CxxVectorSum.benchmarks)
262-
register(CxxSpanTests.benchmarks)
263261
register(DataBenchmarks.benchmarks)
264262
register(DeadArray.benchmarks)
265263
register(DevirtualizeProtocolComposition.benchmarks)

0 commit comments

Comments
 (0)