Merge pull request #162 from countvajhula/proper-profiling

Towards proper profiling

Makefile

@@ -40,11 +40,12 @@ help:
 	@echo "coverage-check - Run test coverage checker"
 	@echo "coverage-report - View test coverage report"
 	@echo "docs - view docs in a browser"
-	@echo "profile - Run comprehensive performance benchmarks"
-	@echo "profile-competitive - Run competitive benchmarks"
-	@echo "profile-local - Run benchmarks for individual Qi forms"
-	@echo "profile-nonlocal - Run nonlocal benchmarks exercising many components at once"
-	@echo "profile-selected-forms - Run benchmarks for Qi forms by name (command only)"
+	@echo "profile - Get a performance profile of any Racket command"
+	@echo "benchmark - Run comprehensive performance benchmarks"
+	@echo "benchmark-competitive - Run competitive benchmarks"
+	@echo "benchmark-local - Run benchmarks for individual Qi forms"
+	@echo "benchmark-nonlocal - Run nonlocal benchmarks exercising many components at once"
+	@echo "benchmark-selected-forms - Run benchmarks for Qi forms by name (command only)"
 	@echo "performance-report - Run benchmarks for Qi forms and produce results for use in CI and for measuring regression"
 	@echo "  For use in regression: make performance-report > /path/to/before.json"
 	@echo "performance-regression-report - Run benchmarks for Qi forms against a reference report."
@@ -180,27 +181,35 @@ cover: coverage-check coverage-report
 cover-coveralls:
 	raco cover -b -f coveralls -p $(PACKAGE-NAME)-{lib,test}
 
-profile-local:
-	racket $(PACKAGE-NAME)-sdk/profile/local/report.rkt
+profile:
+	@echo "To get a performance profile:"
+	@echo "  raco profile --total <any Racket command, including arguments>"
+	@echo "Example:"
+	@echo "  raco profile --total qi-sdk/benchmarks/nonlocal/report-competitive.rkt -s filter-map"
+	@echo "For more options:"
+	@echo "  raco profile --help"
 
-profile-loading:
-	racket $(PACKAGE-NAME)-sdk/profile/loading/report.rkt
+benchmark-local:
+	racket $(PACKAGE-NAME)-sdk/benchmarks/local/report.rkt
 
-profile-selected-forms:
-	@echo "Use 'racket $(PACKAGE-NAME)-sdk/profile/local/report.rkt' directly, with -s form-name for each form."
+benchmark-loading:
+	racket $(PACKAGE-NAME)-sdk/benchmarks/loading/report.rkt
 
-profile-competitive:
-	cd $(PACKAGE-NAME)-sdk/profile/nonlocal; racket report-competitive.rkt
+benchmark-selected-forms:
+	@echo "Use 'racket $(PACKAGE-NAME)-sdk/benchmarks/local/report.rkt' directly, with -s form-name for each form."
 
-profile-nonlocal:
-	cd $(PACKAGE-NAME)-sdk/profile/nonlocal; racket report-intrinsic.rkt -l qi
+benchmark-competitive:
+	cd $(PACKAGE-NAME)-sdk/benchmarks/nonlocal; racket report-competitive.rkt
 
-profile: profile-local profile-nonlocal profile-loading
+benchmark-nonlocal:
+	cd $(PACKAGE-NAME)-sdk/benchmarks/nonlocal; racket report-intrinsic.rkt -l qi
+
+benchmark: benchmark-local benchmark-nonlocal benchmark-loading
 
 performance-report:
-	@racket $(PACKAGE-NAME)-sdk/profile/report.rkt -f json
+	@racket $(PACKAGE-NAME)-sdk/benchmarks/report.rkt -f json
 
 performance-regression-report:
-	@racket $(PACKAGE-NAME)-sdk/profile/report.rkt -r $(REF)
+	@racket $(PACKAGE-NAME)-sdk/benchmarks/report.rkt -r $(REF)
 
-.PHONY:	help install remove build build-docs build-all clean check-deps test test-flow test-on test-threading test-switch test-definitions test-macro test-util test-expander test-compiler test-probe test-with-errortrace errortrace errortrace-flow errortrace-on errortrace-threading errortrace-switch errortrace-definitions errortrace-macro errortrace-util errortrace-probe docs cover coverage-check coverage-report cover-coveralls profile-local profile-loading profile-selected-forms profile-competitive profile-nonlocal profile performance-report performance-regression-report
+.PHONY:	help install remove build build-docs build-all clean check-deps test test-flow test-on test-threading test-switch test-definitions test-macro test-util test-expander test-compiler test-probe test-with-errortrace errortrace errortrace-flow errortrace-on errortrace-threading errortrace-switch errortrace-definitions errortrace-macro errortrace-util errortrace-probe docs cover coverage-check coverage-report cover-coveralls profile benchmark-local benchmark-loading benchmark-selected-forms benchmark-competitive benchmark-nonlocal benchmark performance-report performance-regression-report

qi-sdk/profile/loading/loadlib.rkt → qi-sdk/benchmarks/loading/loadlib.rkt

@@ -1,12 +1,12 @@
 #!/usr/bin/env racket
 #lang racket/base
 
-(provide profile-load)
+(provide require-latency)
 
 (require pkg/require-latency
          racket/format)
 
-(define (profile-load module-name)
+(define (require-latency module-name)
   (let ([name (~a "(require " module-name ")")]
         [ms (cdr (time-module-ms module-name))])
     (displayln (~a name ": " ms " ms")

qi-sdk/profile/loading/report.rkt → qi-sdk/benchmarks/loading/report.rkt

@@ -30,7 +30,7 @@
 (program (main)
   (displayln "\nMeasuring module load time..." (current-error-port))
 
-  (let ([output (profile-load "qi")])
+  (let ([output (require-latency "qi")])
     (if (regression-file)
         (let ([before (parse-benchmarks (parse-json-file (regression-file)))]
               [after (parse-benchmarks output)])

qi-sdk/profile/report.rkt → qi-sdk/benchmarks/report.rkt

@@ -53,7 +53,7 @@
                             (n:benchmark "qi" (selected))
                             null)]
          [require-data (if (member? (report-type) (list "all" "loading"))
-                           (list (profile-load "qi"))
+                           (list (require-latency "qi"))
                            null)]
          [output (~ local-data nonlocal-data require-data)])
     (if (regression-file)