From 61ef6f3f96555a6ede2928cf7c24329302ea8d3d Mon Sep 17 00:00:00 2001
From: Nathan Brei <nbrei@jlab.org>
Date: Wed, 11 Sep 2024 12:55:31 -0400
Subject: [PATCH] Remove JPerfUtils

---
 src/libraries/JANA/CMakeLists.txt             |  3 -
 src/libraries/JANA/Utils/JPerfUtils.cc        | 99 -------------------
 src/libraries/JANA/Utils/JPerfUtils.h         | 25 -----
 .../unit_tests/Topology/TopologyTests.cc      |  1 -
 4 files changed, 128 deletions(-)
 delete mode 100644 src/libraries/JANA/Utils/JPerfUtils.cc
 delete mode 100644 src/libraries/JANA/Utils/JPerfUtils.h

diff --git a/src/libraries/JANA/CMakeLists.txt b/src/libraries/JANA/CMakeLists.txt
index c800b3578..1ca7a8800 100644
--- a/src/libraries/JANA/CMakeLists.txt
+++ b/src/libraries/JANA/CMakeLists.txt
@@ -31,10 +31,7 @@ set(JANA2_SOURCES
 
     Utils/JCpuInfo.cc
     Utils/JProcessorMapping.cc
-    Utils/JPerfUtils.cc
-    Utils/JPerfUtils.h
     Utils/JBenchUtils.cc
-    Utils/JBenchUtils.h
     Utils/JStringification.cc
     Utils/JAutoActivator.cc
     Utils/JTablePrinter.cc
diff --git a/src/libraries/JANA/Utils/JPerfUtils.cc b/src/libraries/JANA/Utils/JPerfUtils.cc
deleted file mode 100644
index 864c53068..000000000
--- a/src/libraries/JANA/Utils/JPerfUtils.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// Copyright 2020, Jefferson Science Associates, LLC.
-// Subject to the terms in the LICENSE file found in the top-level directory.
-
-
-#include <thread>
-#include <algorithm>
-
-#include "JPerfUtils.h"
-
-
-thread_local std::mt19937* generator = nullptr;
-
-uint64_t consume_cpu_ms(uint64_t millisecs, double spread, bool fix_flops) {
-
-    uint64_t sampled = rand_size(millisecs, spread);
-    uint64_t result = 0;
-
-    if (fix_flops) {
-        // Perform a fixed amount of work in a variable time
-        const uint64_t appx_iters_per_millisec = 14000;
-        sampled *= appx_iters_per_millisec;
-
-        for (uint64_t i=0; i<sampled; ++i) {
-            double a = (*generator)();
-            double b = sqrt(a * pow(1.23, -a)) / a;
-            result += long(b);
-        }
-    }
-    else {
-        // Perform a variable amount of work in a fixed time
-        auto duration = std::chrono::milliseconds(sampled);
-        auto start_time = std::chrono::steady_clock::now();
-        while ((std::chrono::steady_clock::now() - start_time) < duration) {
-
-            double a = (*generator)();
-            double b = sqrt(a * pow(1.23, -a)) / a;
-            result += long(b);
-        }
-    }
-    return result;
-}
-
-uint64_t read_memory(const std::vector<char>& buffer) {
-
-    auto length = buffer.size();
-    uint64_t sum = 0;
-    for (unsigned i=0; i<length; ++i) {
-        sum += buffer[i];
-    }
-    return sum;
-}
-
-uint64_t write_memory(std::vector<char>& buffer, uint64_t bytes, double spread) {
-
-    uint64_t sampled = rand_size(bytes, spread);
-    for (unsigned i=0; i<sampled; ++i) {
-        buffer.push_back(2);
-    }
-    return sampled*2;
-}
-
-void init_generator() {
-    if (!generator) {
-        std::hash<std::thread::id> hasher;
-        long now = std::chrono::steady_clock::now().time_since_epoch().count();
-        long seed = now + hasher(std::this_thread::get_id());
-        generator = new std::mt19937(seed);
-    }
-}
-
-size_t rand_size(size_t avg, double spread) {
-    auto delta = static_cast<size_t>(avg*spread);
-    init_generator();
-    std::uniform_int_distribution<size_t> distribution(avg-delta, avg+delta);
-    return distribution(*generator);
-}
-
-
-int randint(int min, int max) {
-    init_generator();
-    std::uniform_int_distribution<int> distribution(min, max);
-    return distribution(*generator);
-}
-
-double randdouble(double min, double max) {
-    init_generator();
-    std::uniform_real_distribution<double> dist(min, max);
-    return dist(*generator);
-}
-
-float randfloat(float min, float max) {
-    init_generator();
-    std::uniform_real_distribution<float> dist(min, max);
-    return dist(*generator);
-}
-
-
-
diff --git a/src/libraries/JANA/Utils/JPerfUtils.h b/src/libraries/JANA/Utils/JPerfUtils.h
deleted file mode 100644
index 08813d4a6..000000000
--- a/src/libraries/JANA/Utils/JPerfUtils.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// Copyright 2020, Jefferson Science Associates, LLC.
-// Subject to the terms in the LICENSE file found in the top-level directory.
-
-#pragma once
-
-#include <vector>
-#include <random>
-
-extern thread_local std::mt19937* generator;
-
-
-uint64_t consume_cpu_ms(uint64_t millisecs, double spread=0.0, bool fix_flops=true);
-
-uint64_t read_memory(const std::vector<char>& buffer);
-
-uint64_t write_memory(std::vector<char>& buffer, uint64_t bytes, double spread=0.0);
-
-size_t rand_size(size_t avg, double spread);
-
-int randint(int min, int max);
-
-double randdouble(double min=0.0, double max=1000.0);
-
-float randfloat(float min=0.0, float max=1000.0);
diff --git a/src/programs/unit_tests/Topology/TopologyTests.cc b/src/programs/unit_tests/Topology/TopologyTests.cc
index 5535cda4d..d13e89c48 100644
--- a/src/programs/unit_tests/Topology/TopologyTests.cc
+++ b/src/programs/unit_tests/Topology/TopologyTests.cc
@@ -9,7 +9,6 @@
 
 #include "TestTopologyComponents.h"
 #include <JANA/Utils/JBenchUtils.h>
-#include <JANA/Utils/JPerfUtils.h>
 #include <JANA/Engine/JScheduler.h>