Merge branch 'master' into cleanup-iddict

Author: MilesCranmer

.github/workflows/benchmark_pr.yml

@@ -38,7 +38,7 @@ jobs:
                 echo $PATH
                 ls -l ~/.julia/bin
                 mkdir results
-                benchpkg ${{ steps.extract-package-name.outputs.package_name }} --rev="${{github.event.repository.default_branch}},${{github.event.pull_request.head.sha}}" --url=${{ github.event.repository.clone_url }} --bench-on="${{github.event.repository.default_branch}}" --output-dir=results/ --tune
+                benchpkg ${{ steps.extract-package-name.outputs.package_name }} --rev="${{github.event.repository.default_branch}},${{github.event.pull_request.head.sha}}" --url=${{ github.event.repository.clone_url }} --bench-on="${{github.event.pull_request.head.sha}}" --output-dir=results/ --tune
             - name: Create plots from benchmarks
               run: |
                 mkdir -p plots

Project.toml

@@ -10,7 +10,7 @@ MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
-SnoopPrecompile = "66db9d55-30c0-4569-8b51-7e840670fc0c"
+PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
@@ -19,7 +19,7 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 LoopVectorization = "0.12"
 MacroTools = "0.4, 0.5"
 Reexport = "1"
-SnoopPrecompile = "1"
+PrecompileTools = "1"
 SymbolicUtils = "0.19, ^1.0.5"
 Zygote = "0.6"
 julia = "1.6"

src/precompile.jl

@@ -1,4 +1,4 @@
-import SnoopPrecompile: @precompile_all_calls, @precompile_setup
+import PrecompileTools: @compile_workload, @setup_workload
 
 macro ignore_domain_error(ex)
     return esc(
@@ -163,9 +163,9 @@ function test_functions_on_trees(::Type{T}, operators) where {T}
     return nothing
 end
 
-macro maybe_precompile_setup(mode, ex)
+macro maybe_setup_workload(mode, ex)
     precompile_ex = Expr(
-        :macrocall, Symbol("@precompile_setup"), LineNumberNode(@__LINE__), ex
+        :macrocall, Symbol("@setup_workload"), LineNumberNode(@__LINE__), ex
     )
     return quote
         if $(esc(mode)) == :compile
@@ -178,9 +178,9 @@ macro maybe_precompile_setup(mode, ex)
     end
 end
 
-macro maybe_precompile_all_calls(mode, ex)
+macro maybe_compile_workload(mode, ex)
     precompile_ex = Expr(
-        :macrocall, Symbol("@precompile_all_calls"), LineNumberNode(@__LINE__), ex
+        :macrocall, Symbol("@compile_workload"), LineNumberNode(@__LINE__), ex
     )
     return quote
         if $(esc(mode)) == :compile
@@ -195,12 +195,12 @@ end
 
 """`mode=:precompile` will use `@precompile_*` directives; `mode=:compile` runs."""
 function do_precompilation(; mode=:precompile)
-    @maybe_precompile_setup mode begin
+    @maybe_setup_workload mode begin
         binary_operators = [[+, -, *, /]]
         unary_operators = [[sin, cos]]
         turbo = [false]
         types = [Float32, Float64]
-        @maybe_precompile_all_calls mode begin
+        @maybe_compile_workload mode begin
             test_all_combinations(;
                 binary_operators=binary_operators,
                 unary_operators=unary_operators,
@@ -216,7 +216,7 @@ function do_precompilation(; mode=:precompile)
         # Want to precompile all above calls.
         types = [Float32, Float64]
         for T in types
-            @maybe_precompile_all_calls mode begin
+            @maybe_compile_workload mode begin
                 test_functions_on_trees(T, operators)
             end
         end