Skip to content

[stdilb]Re-enable iterator benchmarks, remove longSharedPrefix from hashing b… #20604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2018
Merged

[stdilb]Re-enable iterator benchmarks, remove longSharedPrefix from hashing b… #20604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 151 additions & 15 deletions benchmark/single-source/StringComparison.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ extension String {
}


// TODO(UTF8 post-merge): Disable longSharedPrefix hashing benchmark, which is
// enabled here for 1-to-1 comparison vs master

// TODO(UTF8 post-merge): Enable NormalizedIteratorWorkloads for ["ascii",
// "latin1", "fastPrenormal", "slowerPrenormal", "nonBMPSlowestPrenormal",
// "emoji", "abnormal", "zalgo"]


public let StringComparison: [BenchmarkInfo] = [
Expand Down Expand Up @@ -144,15 +138,57 @@ public let StringHashing: [BenchmarkInfo] = [
tags: [.validation, .api, .String],
setUpFunction: { blackHole(Workload_zalgo) }
),
BenchmarkInfo(
name: "StringHashing_longSharedPrefix",
runFunction: run_StringHashing_longSharedPrefix,
tags: [.validation, .api, .String],
setUpFunction: { blackHole(Workload_longSharedPrefix) }
),
]

public let NormalizedIterator: [BenchmarkInfo] = [
BenchmarkInfo(
name: "NormalizedIterator_ascii",
runFunction: run_NormalizedIterator_ascii,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_ascii) }
),
BenchmarkInfo(
name: "NormalizedIterator_latin1",
runFunction: run_NormalizedIterator_latin1,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_latin1) }
),
BenchmarkInfo(
name: "NormalizedIterator_fastPrenormal",
runFunction: run_NormalizedIterator_fastPrenormal,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_fastPrenormal) }
),
BenchmarkInfo(
name: "NormalizedIterator_slowerPrenormal",
runFunction: run_NormalizedIterator_slowerPrenormal,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_slowerPrenormal) }
),
BenchmarkInfo(
name: "NormalizedIterator_nonBMPSlowestPrenormal",
runFunction: run_NormalizedIterator_nonBMPSlowestPrenormal,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_nonBMPSlowestPrenormal) }
),
BenchmarkInfo(
name: "NormalizedIterator_emoji",
runFunction: run_NormalizedIterator_emoji,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_emoji) }
),
BenchmarkInfo(
name: "NormalizedIterator_abnormal",
runFunction: run_NormalizedIterator_abnormal,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_abnormal) }
),
BenchmarkInfo(
name: "NormalizedIterator_zalgo",
runFunction: run_NormalizedIterator_zalgo,
tags: [.validation, .String],
setUpFunction: { blackHole(Workload_zalgo) }
),
]

var Workload_ascii: Workload! = Workload.ascii
Expand Down Expand Up @@ -397,18 +433,118 @@ public func run_StringHashing_zalgo(_ N: Int) {
}
}


@inline(never)
public func run_StringHashing_longSharedPrefix(_ N: Int) {
let workload: Workload = Workload.longSharedPrefix
public func run_NormalizedIterator_ascii(_ N: Int) {
let workload: Workload = Workload.ascii
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
blackHole(str.hashValue)
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}

@inline(never)
public func run_NormalizedIterator_latin1(_ N: Int) {
let workload: Workload = Workload.latin1
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}

@inline(never)
public func run_NormalizedIterator_fastPrenormal(_ N: Int) {
let workload: Workload = Workload.fastPrenormal
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}

@inline(never)
public func run_NormalizedIterator_slowerPrenormal(_ N: Int) {
let workload: Workload = Workload.slowerPrenormal
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}

@inline(never)
public func run_NormalizedIterator_nonBMPSlowestPrenormal(_ N: Int) {
let workload: Workload = Workload.nonBMPSlowestPrenormal
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}

@inline(never)
public func run_NormalizedIterator_emoji(_ N: Int) {
let workload: Workload = Workload.emoji
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}

@inline(never)
public func run_NormalizedIterator_abnormal(_ N: Int) {
let workload: Workload = Workload.abnormal
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}

@inline(never)
public func run_NormalizedIterator_zalgo(_ N: Int) {
let workload: Workload = Workload.zalgo
let tripCount = workload.tripCount
let payload = workload.payload
for _ in 1...tripCount*N {
for str in payload {
str._withNFCCodeUnits { cu in
blackHole(cu)
}
}
}
}


struct Workload {
Expand Down
10 changes: 2 additions & 8 deletions benchmark/single-source/StringComparison.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,10 @@ extension String {

% AllWorkloads = ["ascii", "latin1", "fastPrenormal", "slowerPrenormal", "nonBMPSlowestPrenormal", "emoji", "abnormal", "zalgo", "longSharedPrefix"]
% ComparisonWorkloads = AllWorkloads
% HashingWorkloads = ["ascii", "latin1", "fastPrenormal", "slowerPrenormal", "nonBMPSlowestPrenormal", "emoji", "abnormal", "zalgo", "longSharedPrefix"]
% HashingWorkloads = ["ascii", "latin1", "fastPrenormal", "slowerPrenormal", "nonBMPSlowestPrenormal", "emoji", "abnormal", "zalgo"]

// TODO(UTF8 post-merge): Disable longSharedPrefix hashing benchmark, which is
// enabled here for 1-to-1 comparison vs master

// TODO(UTF8 post-merge): Enable NormalizedIteratorWorkloads for ["ascii",
// "latin1", "fastPrenormal", "slowerPrenormal", "nonBMPSlowestPrenormal",
// "emoji", "abnormal", "zalgo"]

% NormalizedIteratorWorkloads = []
% NormalizedIteratorWorkloads = ["ascii", "latin1", "fastPrenormal", "slowerPrenormal", "nonBMPSlowestPrenormal", "emoji", "abnormal", "zalgo"]

public let StringComparison: [BenchmarkInfo] = [
% for Name in ComparisonWorkloads:
Expand Down