diff --git a/perf/impl/Makefile b/perf/impl/Makefile index 61f0a8208..e274d58dc 100644 --- a/perf/impl/Makefile +++ b/perf/impl/Makefile @@ -5,14 +5,14 @@ QUIC_GO_SUBDIRS := $(wildcard quic-go/*/.) JS_SUBDIRS := $(wildcard js-libp2p/*/.) all: $(RUST_SUBDIRS) $(GO_SUBDIRS) $(HTTPS_SUBDIRS) $(QUIC_GO_SUBDIRS) $(JS_SUBDIRS) -#$(RUST_SUBDIRS): -# $(MAKE) -C $@ -#$(GO_SUBDIRS): -# $(MAKE) -C $@ -#$(HTTPS_SUBDIRS): -# $(MAKE) -C $@ -#$(QUIC_GO_SUBDIRS): -# $(MAKE) -C $@ +$(RUST_SUBDIRS): + $(MAKE) -C $@ +$(GO_SUBDIRS): + $(MAKE) -C $@ +$(HTTPS_SUBDIRS): + $(MAKE) -C $@ +$(QUIC_GO_SUBDIRS): + $(MAKE) -C $@ $(JS_SUBDIRS): $(MAKE) -C $@ diff --git a/perf/impl/js-libp2p/next/perf b/perf/impl/js-libp2p/next/perf index 948a6d8ee..b8f724b6b 100755 --- a/perf/impl/js-libp2p/next/perf +++ b/perf/impl/js-libp2p/next/perf @@ -28,7 +28,5 @@ for ((i = 1; i <= $#; i++)); do fi done -export DEBUG=libp2p*,*:trace - # Run perf node impl/js-libp2p/v0.46/index.js --run-server=$run_server --server-address=$server_address --upload-bytes=$upload_bytes --download-bytes=$download_bytes --transport=$transport diff --git a/perf/impl/js-libp2p/v0.46/perf b/perf/impl/js-libp2p/v0.46/perf index 948a6d8ee..b8f724b6b 100755 --- a/perf/impl/js-libp2p/v0.46/perf +++ b/perf/impl/js-libp2p/v0.46/perf @@ -28,7 +28,5 @@ for ((i = 1; i <= $#; i++)); do fi done -export DEBUG=libp2p*,*:trace - # Run perf node impl/js-libp2p/v0.46/index.js --run-server=$run_server --server-address=$server_address --upload-bytes=$upload_bytes --download-bytes=$download_bytes --transport=$transport diff --git a/perf/runner/src/index.ts b/perf/runner/src/index.ts index d161a1177..92637a27d 100644 --- a/perf/runner/src/index.ts +++ b/perf/runner/src/index.ts @@ -19,8 +19,8 @@ async function main(clientPublicIP: string, serverPublicIP: string, testing: boo uploadBytes: Number.MAX_SAFE_INTEGER, downloadBytes: 0, unit: "bit/s", - iterations: 1, - durationSecondsPerIteration: 5, + iterations: testing ? 1 : 10, + durationSecondsPerIteration: testing ? 5 : 20, }), runBenchmarkAcrossVersions({ name: "throughput/download", @@ -29,8 +29,8 @@ async function main(clientPublicIP: string, serverPublicIP: string, testing: boo uploadBytes: 0, downloadBytes: Number.MAX_SAFE_INTEGER, unit: "bit/s", - iterations: 1, - durationSecondsPerIteration: 5, + iterations: testing ? 1 : 10, + durationSecondsPerIteration: testing ? 5 : 20, }), runBenchmarkAcrossVersions({ name: "Connection establishment + 1 byte round trip latencies", @@ -39,7 +39,7 @@ async function main(clientPublicIP: string, serverPublicIP: string, testing: boo uploadBytes: 1, downloadBytes: 1, unit: "s", - iterations: 1, + iterations: testing ? 1 : 100, durationSecondsPerIteration: Number.MAX_SAFE_INTEGER, }), ]; diff --git a/perf/runner/src/versions.ts b/perf/runner/src/versions.ts index 3007ec4ca..110472828 100644 --- a/perf/runner/src/versions.ts +++ b/perf/runner/src/versions.ts @@ -5,7 +5,7 @@ export type Version = { } export const versions: Array = [ -/* { + { id: "v0.34", implementation: "quic-go", transportStacks: ["quic-v1"] @@ -39,7 +39,7 @@ export const versions: Array = [ id: "v0.31", implementation: "go-libp2p", transportStacks: ["tcp", "quic-v1"] - },*/ + }, { id: "v0.46", implementation: "js-libp2p",