Skip to content

Add more result verification to be able to benchmark with C++ on more machines #96

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

Open
smarr wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add more result verification to be able to benchmark with C++ on more machines #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2867e88
Extract the version from the CXX command when it’s set
smarr Nov 9, 2024
bd3d904
[Python] Add smaller verification for NBody and Mandelbrot
smarr Nov 10, 2024
50cb0a8
[Python] More verification
smarr Nov 10, 2024
edbd57a
[C++/Python] Added more verified results
smarr Nov 10, 2024
66e1ff3
More C++ verification
smarr Nov 10, 2024
001802f
Added Java verification
smarr Nov 10, 2024
9e47b0e
More Java verification
smarr Nov 10, 2024
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
2 changes: 2 additions & 0 deletions benchmarks/C++/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ if [ -z "$CXX" ]; then

# trying to avoid bugs, CXX should be used at this point
unset CMD
else
CMD_VERSION="-${CXX##*-}"
fi

if [[ $CXX == *"clang"* ]]; then
Expand Down
5 changes: 1 addition & 4 deletions benchmarks/C++/src/cd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,10 +918,7 @@ class CD : public Benchmark {
}

static bool verify_result(size_t actualCollisions, int32_t numAircrafts) {
if (numAircrafts == 1000) {
return actualCollisions == 14484;
}
if (numAircrafts == 500) {
if (numAircrafts >= 500) {
return actualCollisions == 14484;
}
if (numAircrafts == 250) {
Expand Down
3 changes: 3 additions & 0 deletions benchmarks/C++/src/havlak.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,9 @@ class Havlak : public Benchmark {
}

bool verifyResult(std::array<int32_t, 2> r, int32_t innerIterations) {
if (innerIterations == 40000) {
return r[0] == 121602 && r[1] == 5213;
}
if (innerIterations == 15000) {
return r[0] == 46602 && r[1] == 5213;
}
Expand Down
16 changes: 14 additions & 2 deletions benchmarks/C++/src/mandelbrot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,24 @@ class Mandelbrot : public Benchmark {

private:
bool verify_result(int32_t result, int32_t inner_iterations) {
if (inner_iterations == 500) {
return result == 191;
if (inner_iterations == 2000) {
return result == 187;
}
if (inner_iterations == 750) {
return result == 50;
}
if (inner_iterations == 500) {
return result == 191;
}
if (inner_iterations == 250) {
return result == 15;
}
if (inner_iterations == 150) {
return result == 240;
}
if (inner_iterations == 50) {
return result == 15;
}
if (inner_iterations == 1) {
return result == 128;
}
Expand Down
15 changes: 15 additions & 0 deletions benchmarks/C++/src/nbody.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,24 @@ class NBodySystem {
class NBody : public Benchmark {
private:
bool verify_result(double result, int32_t innerIterations) {
if (innerIterations == 10000000) {
return result == -0.1690778416543499;
}
if (innerIterations == 1000000) {
return result == -0.16908618459850192;
}
if (innerIterations == 250000) {
return result == -0.1690859889909308;
}
if (innerIterations == 160000) {
return result == -0.16901416322875248;
}
if (innerIterations == 16000) {
return result == -0.16902211820216737;
}
if (innerIterations == 1600) {
return result == -0.16901124420350946;
}
if (innerIterations == 1) {
return result == -0.16907495402506745;
}
Expand Down
3 changes: 1 addition & 2 deletions benchmarks/Java/src/CD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ public boolean innerBenchmarkLoop(final int innerIterations) {
}

public boolean verifyResult(final int actualCollisions, final int numAircrafts) {
if (numAircrafts == 1000) { return actualCollisions == 14484; }
if (numAircrafts == 500) { return actualCollisions == 14484; }
if (numAircrafts >= 500) { return actualCollisions == 14484; }
if (numAircrafts == 250) { return actualCollisions == 10830; }
if (numAircrafts == 200) { return actualCollisions == 8655; }
if (numAircrafts == 100) { return actualCollisions == 4305; }
Expand Down
1 change: 1 addition & 0 deletions benchmarks/Java/src/Havlak.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public boolean innerBenchmarkLoop(final int innerIterations) {
}

public boolean verifyResult(final int[] r, final int innerIterations) {
if (innerIterations == 40000) { return r[0] == 121602 && r[1] == 5213; }
if (innerIterations == 15000) { return r[0] == 46602 && r[1] == 5213; }
if (innerIterations == 1500) { return r[0] == 6102 && r[1] == 5213; }
if (innerIterations == 150) { return r[0] == 2052 && r[1] == 5213; }
Expand Down
16 changes: 14 additions & 2 deletions benchmarks/Java/src/Mandelbrot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,24 @@ public boolean verifyResult(final Object result) {
}

private boolean verifyResult(final int result, final int innerIterations) {
if (innerIterations == 500) {
return result == 191;
if (innerIterations == 2000) {
return result == 187;
}
if (innerIterations == 750) {
return result == 50;
}
if (innerIterations == 500) {
return result == 191;
}
if (innerIterations == 250) {
return result == 15;
}
if (innerIterations == 150) {
return result == 240;
}
if (innerIterations == 50) {
return result == 15;
}
if (innerIterations == 1) {
return result == 128;
}
Expand Down
15 changes: 15 additions & 0 deletions benchmarks/Java/src/NBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,24 @@ public boolean innerBenchmarkLoop(final int innerIterations) {
}

private boolean verifyResult(final double result, final int innerIterations) {
if (innerIterations == 10000000) {
return result == -0.1690778416543499;
}
if (innerIterations == 1000000) {
return result == -0.16908618459850192;
}
if (innerIterations == 250000) {
return result == -0.1690859889909308;
}
if (innerIterations == 160000) {
return result == -0.16901416322875248;
}
if (innerIterations == 16000) {
return result == -0.16902211820216737;
}
if (innerIterations == 1600) {
return result == -0.16901124420350946;
}
if (innerIterations == 1) {
return result == -0.16907495402506745;
}
Expand Down
3 changes: 1 addition & 2 deletions benchmarks/JavaScript/cd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,8 +833,7 @@ class CD extends Benchmark {
}

verifyResult(actualCollisions, numAircrafts) {
if (numAircrafts === 1000) { return actualCollisions === 14484; }
if (numAircrafts === 500) { return actualCollisions === 14484; }
if (numAircrafts >= 500) { return actualCollisions === 14484; }
if (numAircrafts === 250) { return actualCollisions === 10830; }
if (numAircrafts === 200) { return actualCollisions === 8655; }
if (numAircrafts === 100) { return actualCollisions === 4305; }
Expand Down
10 changes: 8 additions & 2 deletions benchmarks/Python/mandelbrot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,16 @@ def verify_result(self, result):

@staticmethod
def _verify_result(result, inner_iterations):
if inner_iterations == 500:
return result == 191
if inner_iterations == 750:
return result == 50
if inner_iterations == 500:
return result == 191
if inner_iterations == 250:
return result == 15
if inner_iterations == 150:
return result == 240
if inner_iterations == 50:
return result == 15
if inner_iterations == 1:
return result == 128

Expand Down
9 changes: 8 additions & 1 deletion benchmarks/Python/nbody.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,16 @@ def inner_benchmark_loop(self, inner_iterations):

@staticmethod
def _verify_result(result, inner_iterations):
if inner_iterations == 1000000:
return result == -0.16908618459850192
if inner_iterations == 250000:
return result == -0.1690859889909308

if inner_iterations == 160000:
return result == -0.16901416322875248
if inner_iterations == 16000:
return result == -0.16902211820216737
if inner_iterations == 1600:
return result == -0.16901124420350946
if inner_iterations == 1:
return result == -0.16907495402506745

Expand Down
Loading