Skip to content

Commit 0b20d96

Browse files
committed
Adjust the path of the Sieve benchmark
1 parent e30da94 commit 0b20d96

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

TS/src/Sieve.lf renamed to TS/Savina/src/parallelism/Sieve.lf

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
*
66
* @author Wonseo Choi
77
*/
8-
98

109
target TypeScript {
1110
fast: true
12-
#logging: DEBUG
1311
};
1412

15-
import BenchmarkRunner from "BenchmarkRunner.lf";
16-
13+
import BenchmarkRunner from "../BenchmarkRunner.lf";
1714

1815
reactor Ramp(totalNumber:number(100000), period:time(1 nsec)) {
1916
input start: boolean;
@@ -35,9 +32,7 @@ reactor Ramp(totalNumber:number(100000), period:time(1 nsec)) {
3532
} else{
3633
end = true;
3734
}
38-
3935
=}
40-
4136
}
4237

4338
reactor Filter(primeStart: number(2), primeNumber: number(1000)) {
@@ -69,16 +64,8 @@ reactor Filter(primeStart: number(2), primeNumber: number(1000)) {
6964
// Potential prime found.
7065
if (!hasChild) {
7166
let n = new Filter(this.getReactor(), p, primeNumber);
72-
//this.start(n)
73-
// console.log("CREATING...")
74-
// let x = this.create(Filter, [this.getReactor(), p])
75-
// console.log("CREATED: " + x._getFullyQualifiedName())
76-
// util.getPort(out) -> __out.getPort()
7767
var port = __out.getPort();
7868
this.connect(port, n.inp);
79-
// FIXME: this updates the dependency graph, but it doesn't redo the topological sort
80-
// For a pipeline like this one, it is not necessary, but in general it is.
81-
// Can we avoid redoing the entire sort?
8269
hasChild = true;
8370
} else {
8471
out = p;
@@ -90,7 +77,7 @@ reactor Filter(primeStart: number(2), primeNumber: number(1000)) {
9077

9178

9279
main reactor Sieve(numIterations:number(12), totalNumber:number(100000), primeStart: number(2), primeNumber: number(1000), period: time(1 nsec)) {
93-
runner = new BenchmarkRunner(num_iterations=numIterations);
80+
runner = new BenchmarkRunner(numIterations=numIterations);
9481
source = new Ramp(totalNumber=totalNumber, period=period);
9582
filter = new Filter(primeStart=primeStart, primeNumber=primeNumber);
9683

@@ -101,5 +88,4 @@ main reactor Sieve(numIterations:number(12), totalNumber:number(100000), primeSt
10188
runner.start -> source.start;
10289
source.value -> filter.inp;
10390
source.end -> runner.finish;
104-
10591
}

0 commit comments

Comments
 (0)