Default to not using perf

Author: Zentrik

docs/src/manual.md

@@ -85,7 +85,7 @@ You can pass the following keyword arguments to `@benchmark`, `@benchmarkable`,
 - `gcsample`: If `true`, run `gc()` before each sample. Defaults to `BenchmarkTools.DEFAULT_PARAMETERS.gcsample = false`.
 - `time_tolerance`: The noise tolerance for the benchmark's time estimate, as a percentage. This is utilized after benchmark execution, when analyzing results. Defaults to `BenchmarkTools.DEFAULT_PARAMETERS.time_tolerance = 0.05`.
 - `memory_tolerance`: The noise tolerance for the benchmark's memory estimate, as a percentage. This is utilized after benchmark execution, when analyzing results. Defaults to `BenchmarkTools.DEFAULT_PARAMETERS.memory_tolerance = 0.01`.
-- `enable_linux_perf`: If `true`, profile using perf once. Defaults to `BenchmarkTools.DEFAULT_PARAMETERS.enable_linux_perf`, which is `true` if perf is available and `false` otherwise.
+- `enable_linux_perf`: If `true`, profile using perf once. Defaults to `BenchmarkTools.DEFAULT_PARAMETERS.enable_linux_perf = false`.
 - `linux_perf_opts`: Options for perf profiling. Defaults to `BenchmarkTools.DEFAULT_PARAMETERS.linux_perf_opts = String[]`. See LinuxPerf.jl for further details.
 
 To change the default values of the above fields, one can mutate the fields of `BenchmarkTools.DEFAULT_PARAMETERS`, for example:

src/execution.jl

@@ -592,41 +592,28 @@ function generate_benchmark_definition(
                 __linux_perf_groups = $LinuxPerf.set_default_spaces(
                     eval(__linux_perf_options.events), eval(__linux_perf_options.spaces)
                 )
-                __linux_perf_bench = nothing
+                __linux_perf_bench = $LinuxPerf.make_bench_threaded(
+                    __linux_perf_groups; threads=eval(__linux_perf_options.threads)
+                )
+
+                $(setup)
                 try
-                    __linux_perf_bench = $LinuxPerf.make_bench_threaded(
-                        __linux_perf_groups; threads=eval(__linux_perf_options.threads)
-                    )
-                catch e
-                    if e isa ErrorException &&
-                        startswith(e.msg, "perf_event_open error : ")
-                        @warn "Perf is disabled" # Really we only want to do this if we defaulted to running with perf, otherwise we should just throw.
-                    # Given we now more accurately determine if perf is available can we do away with this hack?
+                    $LinuxPerf.enable!(__linux_perf_bench)
+                    # We'll just run it one time.
+                    __return_val_2 = $(invocation)
+                    $LinuxPerf.disable!(__linux_perf_bench)
+                    # trick the compiler not to eliminate the code
+                    if rand() < 0
+                        __linux_perf_stats = __return_val_2
                     else
-                        rethrow()
-                    end
-                end
-
-                if !isnothing(__linux_perf_bench)
-                    $(setup)
-                    try
-                        $LinuxPerf.enable!(__linux_perf_bench)
-                        # We'll just run it one time.
-                        __return_val_2 = $(invocation)
-                        $LinuxPerf.disable!(__linux_perf_bench)
-                        # trick the compiler not to eliminate the code
-                        if rand() < 0
-                            __linux_perf_stats = __return_val_2
-                        else
-                            __linux_perf_stats = $LinuxPerf.Stats(__linux_perf_bench)
-                        end
-                        return __linux_perf_stats
-                    catch
-                        rethrow()
-                    finally
-                        close(__linux_perf_bench)
-                        $(teardown)
+                        __linux_perf_stats = $LinuxPerf.Stats(__linux_perf_bench)
                     end
+                    return __linux_perf_stats
+                catch
+                    rethrow()
+                finally
+                    close(__linux_perf_bench)
+                    $(teardown)
                 end
             end
             $BenchmarkTools.Benchmark(

src/parameters.jl

@@ -19,28 +19,6 @@ mutable struct Parameters
     linux_perf_options::Vector{String}
 end
 
-const DEFAULT_LINUX_PERF_OPTIONS = String[]
-
-function perf_available()
-    if !Sys.islinux()
-        return false
-    end
-
-    bench = nothing
-    try
-        opts = LinuxPerf.parse_pstats_options(DEFAULT_LINUX_PERF_OPTIONS)
-        groups = LinuxPerf.set_default_spaces(eval(opts.events), eval(opts.spaces))
-        bench = LinuxPerf.make_bench_threaded(groups; threads=eval(opts.threads))
-        return true
-    catch
-        return false
-    finally
-        if !isnothing(bench)
-            close(bench)
-        end
-    end
-end
-
 const DEFAULT_PARAMETERS = Parameters(
     5.0,
     10000,
@@ -51,8 +29,8 @@ const DEFAULT_PARAMETERS = Parameters(
     false,
     0.05,
     0.01,
-    perf_available(),
-    DEFAULT_LINUX_PERF_OPTIONS,
+    false,
+    String[],
 )
 
 function Parameters(;