From d77d644ef25f2ed388c22eae81d9038d5f9a5a08 Mon Sep 17 00:00:00 2001
From: Luis Gerhorst <luis.gerhorst@fau.de>
Date: Tue, 10 Jul 2018 17:07:32 +0200
Subject: [PATCH] Revert "Introduce Timestamp Type Bernhard"
This reverts commit 279ee4f31ae464879b9f8ad3999d93b63f43c934.
---
arch/arm/measuremore/Kconfig | 4 ----
arch/arm/measuremore/measure.c | 12 ------------
include/linux/measuremore.h | 17 -----------------
3 files changed, 33 deletions(-)
diff --git a/arch/arm/measuremore/Kconfig b/arch/arm/measuremore/Kconfig
index 8c18e9e..f96895f 100644
--- a/arch/arm/measuremore/Kconfig
+++ b/arch/arm/measuremore/Kconfig
@@ -7,10 +7,6 @@ config MEASUREMORE_TIMESTAMP_TYPE_PMCCNTR
depends on MEASUREMORE && ARM
bool "Read PMCCNTR register"
-config MEASUREMORE_TIMESTAMP_TYPE_BERNHARD
- depends on MEASUREMORE
- bool "Read bernhards register"
-
config MEASUREMORE_TIMESTAMP_TYPE_KTIME_MONO_FAST
depends on MEASUREMORE
bool "Call ktime_get_mono_fast_ns()"
diff --git a/arch/arm/measuremore/measure.c b/arch/arm/measuremore/measure.c
index 88900c2..84a8590 100644
--- a/arch/arm/measuremore/measure.c
+++ b/arch/arm/measuremore/measure.c
@@ -236,14 +236,6 @@ static void seq_write_nstimeofday_s_csv_field(struct seq_file *seq,
}
#endif
-#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_BERNHARD
-static void seq_write_bernhard_csv_field(struct seq_file *seq,
- struct checkpoint_record *cpr)
-{
- seq_printf(seq, "%llu", cpr->bernhard);
-}
-#endif
-
static void seq_write_name_csv_field(struct seq_file *seq,
struct checkpoint_record *cpr)
{
@@ -259,10 +251,6 @@ static void export_current_bmr_to_csv_results(void)
create_csv_file("pmccntr", seq_write_pmccntr_csv_field,
csv_results_folder);
#endif
-#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_BERNHARD
- create_csv_file("bernhard", seq_write_bernhard_csv_field,
- csv_results_folder);
-#endif
#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_KTIME_MONO_FAST
create_csv_file("ktime_mono_fast", seq_write_ktime_mono_fast_csv_field,
csv_results_folder);
diff --git a/include/linux/measuremore.h b/include/linux/measuremore.h
index 3ca7065..18f2a12 100644
--- a/include/linux/measuremore.h
+++ b/include/linux/measuremore.h
@@ -19,25 +19,11 @@ struct pmccntr_timestamp {
#endif /* CONFIG_MEASUREMORE_TIMESTAMP_TYPE_PMCCNTR */
-#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_BERNHARD
-
-/* Hier den Code zum auslesen. Wenn du davor noch was einschalten musst / den
- * Counter am Anfang jedes Runs resetten willst kannst du das analog zu
- * pmccntr_reset() / pmccntr_enable() machen (im measuremore Verzeichnis). */
-
-#define bernhard_read(var) \
- do { var = 42; } while (0)
-
-#endif /* CONFIG_MEASUREMORE_TIMESTAMP_TYPE_BERNHARD */
-
struct checkpoint_record {
const char *name;
#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_PMCCNTR
struct pmccntr_timestamp pmccntr_ts;
#endif
-#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_BERNHARD
- uint64_t bernhard;
-#endif
#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_KTIME_MONO_FAST
u64 ktime_mono_fast; /* Alread in ns. */
#endif
@@ -65,9 +51,6 @@ static __always_inline void memo_checkpoint(const char *name) {
#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_PMCCNTR
pmccntr_read(current_cpr->pmccntr_ts.value);
#endif
-#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_BERNHARD
- bernhard_read(current_cpr->bernhard);
-#endif
#ifdef CONFIG_MEASUREMORE_TIMESTAMP_TYPE_KTIME_MONO_FAST
current_cpr->ktime_mono_fast = ktime_get_mono_fast_ns();
#endif
--
GitLab