diff mbox series

[1/3] drm/i915/selftests: Rename librapl library to libpower

Message ID 20221019060402.2807360-2-riana.tauro@intel.com (mailing list archive)
State New, archived
Headers show
Series Add hwmon support for dgfx selftests | expand

Commit Message

Riana Tauro Oct. 19, 2022, 6:04 a.m. UTC 
Rename functions in librapl library to libpower.
No functional changes.

Signed-off-by: Riana Tauro <riana.tauro@intel.com>
---
 drivers/gpu/drm/i915/Makefile                   |  2 +-
 drivers/gpu/drm/i915/gt/selftest_rc6.c          | 12 ++++++------
 drivers/gpu/drm/i915/gt/selftest_rps.c          |  8 ++++----
 drivers/gpu/drm/i915/gt/selftest_slpc.c         |  2 +-
 .../i915/selftests/{librapl.c => libpower.c}    | 10 +++++-----
 drivers/gpu/drm/i915/selftests/libpower.h       | 17 +++++++++++++++++
 drivers/gpu/drm/i915/selftests/librapl.h        | 17 -----------------
 7 files changed, 34 insertions(+), 34 deletions(-)
 rename drivers/gpu/drm/i915/selftests/{librapl.c => libpower.c} (69%)
 create mode 100644 drivers/gpu/drm/i915/selftests/libpower.h
 delete mode 100644 drivers/gpu/drm/i915/selftests/librapl.h

Comments

Gupta, Anshuman Oct. 19, 2022, 1:04 p.m. UTC | #1 
On 10/19/2022 11:34 AM, Riana Tauro wrote:
> Rename functions in librapl library to libpower.
> No functional changes.
It renames the files as well, it will be good to add that info as well.
> 
> Signed-off-by: Riana Tauro <riana.tauro@intel.com>
> ---
>   drivers/gpu/drm/i915/Makefile                   |  2 +-
>   drivers/gpu/drm/i915/gt/selftest_rc6.c          | 12 ++++++------
>   drivers/gpu/drm/i915/gt/selftest_rps.c          |  8 ++++----
>   drivers/gpu/drm/i915/gt/selftest_slpc.c         |  2 +-
>   .../i915/selftests/{librapl.c => libpower.c}    | 10 +++++-----
>   drivers/gpu/drm/i915/selftests/libpower.h       | 17 +++++++++++++++++
>   drivers/gpu/drm/i915/selftests/librapl.h        | 17 -----------------
>   7 files changed, 34 insertions(+), 34 deletions(-)
>   rename drivers/gpu/drm/i915/selftests/{librapl.c => libpower.c} (69%)
>   create mode 100644 drivers/gpu/drm/i915/selftests/libpower.h
>   delete mode 100644 drivers/gpu/drm/i915/selftests/librapl.h
> 
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 2535593ab379..6bb291312c84 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -339,7 +339,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \
>   	selftests/igt_mmap.o \
>   	selftests/igt_reset.o \
>   	selftests/igt_spinner.o \
> -	selftests/librapl.o
> +	selftests/libpower.o
>   
>   # virtual gpu code
>   i915-y += i915_vgpu.o
> diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c b/drivers/gpu/drm/i915/gt/selftest_rc6.c
> index 8c70b7e12074..aacff50dfa89 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
> @@ -11,7 +11,7 @@
>   #include "selftest_rc6.h"
>   
>   #include "selftests/i915_random.h"
> -#include "selftests/librapl.h"
> +#include "selftests/libpower.h"
>   
>   static u64 rc6_residency(struct intel_rc6 *rc6)
>   {
> @@ -51,7 +51,7 @@ int live_rc6_manual(void *arg)
>   	if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915))
>   		return 0;
>   
> -	has_power = librapl_supported(gt->i915);
> +	has_power = libpower_supported(gt->i915);
>   	wakeref = intel_runtime_pm_get(gt->uncore->rpm);
>   
>   	/* Force RC6 off for starters */
> @@ -61,9 +61,9 @@ int live_rc6_manual(void *arg)
>   	res[0] = rc6_residency(rc6);
>   
>   	dt = ktime_get();
> -	rc0_power = librapl_energy_uJ();
> +	rc0_power = libpower_get_energy_uJ();
>   	msleep(250);
> -	rc0_power = librapl_energy_uJ() - rc0_power;
> +	rc0_power = libpower_get_energy_uJ() - rc0_power;
>   	dt = ktime_sub(ktime_get(), dt);
>   	res[1] = rc6_residency(rc6);
>   	if ((res[1] - res[0]) >> 10) {
> @@ -89,9 +89,9 @@ int live_rc6_manual(void *arg)
>   	res[0] = rc6_residency(rc6);
>   	intel_uncore_forcewake_flush(rc6_to_uncore(rc6), FORCEWAKE_ALL);
>   	dt = ktime_get();
> -	rc6_power = librapl_energy_uJ();
> +	rc6_power = libpower_get_energy_uJ();
>   	msleep(100);
> -	rc6_power = librapl_energy_uJ() - rc6_power;
> +	rc6_power = libpower_get_energy_uJ() - rc6_power;
>   	dt = ktime_sub(ktime_get(), dt);
>   	res[1] = rc6_residency(rc6);
>   	if (res[1] == res[0]) {
> diff --git a/drivers/gpu/drm/i915/gt/selftest_rps.c b/drivers/gpu/drm/i915/gt/selftest_rps.c
> index 99a372486fb7..3287698c655b 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_rps.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_rps.c
> @@ -19,7 +19,7 @@
>   #include "selftest_rps.h"
>   #include "selftests/igt_flush_test.h"
>   #include "selftests/igt_spinner.h"
> -#include "selftests/librapl.h"
> +#include "selftests/libpower.h"
>   
>   /* Try to isolate the impact of cstates from determing frequency response */
>   #define CPU_LATENCY 0 /* -1 to disable pm_qos, 0 to disable cstates */
> @@ -1099,9 +1099,9 @@ static u64 __measure_power(int duration_ms)
>   	u64 dE, dt;
>   
>   	dt = ktime_get();
> -	dE = librapl_energy_uJ();
> +	dE = libpower_get_energy_uJ();
>   	usleep_range(1000 * duration_ms, 2000 * duration_ms);
> -	dE = librapl_energy_uJ() - dE;
> +	dE = libpower_get_energy_uJ() - dE;
>   	dt = ktime_get() - dt;
>   
>   	return div64_u64(1000 * 1000 * dE, dt);
> @@ -1147,7 +1147,7 @@ int live_rps_power(void *arg)
>   	if (!intel_rps_is_enabled(rps) || GRAPHICS_VER(gt->i915) < 6)
>   		return 0;
>   
> -	if (!librapl_supported(gt->i915))
> +	if (!libpower_supported(gt->i915))
>   		return 0;
>   
>   	if (igt_spinner_init(&spin, gt))
> diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c
> index 4c6e9257e593..494e7a486b07 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_slpc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c
> @@ -161,7 +161,7 @@ static int slpc_power(struct intel_gt *gt, struct intel_engine_cs *engine)
>   	 * actually saves power. Let's see if our RAPL measurement supports
>   	 * that theory.
>   	 */
> -	if (!librapl_supported(gt->i915))
> +	if (!libpower_supported(gt->i915))
>   		return 0;
>   
>   	min.freq = slpc->min_freq;
> diff --git a/drivers/gpu/drm/i915/selftests/librapl.c b/drivers/gpu/drm/i915/selftests/libpower.c
> similarity index 69%
> rename from drivers/gpu/drm/i915/selftests/librapl.c
> rename to drivers/gpu/drm/i915/selftests/libpower.c
> index eb03b5b28bad..c66e993c5f85 100644
> --- a/drivers/gpu/drm/i915/selftests/librapl.c
> +++ b/drivers/gpu/drm/i915/selftests/libpower.c
> @@ -1,23 +1,23 @@
>   // SPDX-License-Identifier: MIT
>   /*
> - * Copyright © 2020 Intel Corporation
> + * Copyright © 2022 Intel Corporation
>    */
>   
>   #include <asm/msr.h>
>   
>   #include "i915_drv.h"
> -#include "librapl.h"
> +#include "libpower.h"
>   
> -bool librapl_supported(const struct drm_i915_private *i915)
> +bool libpower_supported(const struct drm_i915_private *i915)
>   {
>   	/* Discrete cards require hwmon integration */
>   	if (IS_DGFX(i915))
>   		return false;
>   
> -	return librapl_energy_uJ();
> +	return libpower_get_energy_uJ();
>   }
>   
> -u64 librapl_energy_uJ(void)
> +u64 libpower_get_energy_uJ(void)
>   {
>   	unsigned long long power;
>   	u32 units;
> diff --git a/drivers/gpu/drm/i915/selftests/libpower.h b/drivers/gpu/drm/i915/selftests/libpower.h
> new file mode 100644
> index 000000000000..5352981eb946
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/selftests/libpower.h
> @@ -0,0 +1,17 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2022 Intel Corporation
> + */
> +
> +#ifndef SELFTEST_LIBPOWER_H
> +#define SELFTEST_LIBPOWER_H
> +
> +#include <linux/types.h>
> +
> +struct drm_i915_private;
> +
> +bool libpower_supported(const struct drm_i915_private *i915);
> +
> +u64 libpower_get_energy_uJ(void);
> +
> +#endif /* SELFTEST_LIBPOWER_H */
> diff --git a/drivers/gpu/drm/i915/selftests/librapl.h b/drivers/gpu/drm/i915/selftests/librapl.h
> deleted file mode 100644
> index e3b24fad0a7a..000000000000
> --- a/drivers/gpu/drm/i915/selftests/librapl.h
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2020 Intel Corporation
> - */
> -
> -#ifndef SELFTEST_LIBRAPL_H
> -#define SELFTEST_LIBRAPL_H
> -
> -#include <linux/types.h>
> -
> -struct drm_i915_private;
> -
> -bool librapl_supported(const struct drm_i915_private *i915);
> -
> -u64 librapl_energy_uJ(void);
> -
> -#endif /* SELFTEST_LIBRAPL_H */
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 2535593ab379..6bb291312c84 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -339,7 +339,7 @@  i915-$(CONFIG_DRM_I915_SELFTEST) += \
 	selftests/igt_mmap.o \
 	selftests/igt_reset.o \
 	selftests/igt_spinner.o \
-	selftests/librapl.o
+	selftests/libpower.o
 
 # virtual gpu code
 i915-y += i915_vgpu.o
diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c b/drivers/gpu/drm/i915/gt/selftest_rc6.c
index 8c70b7e12074..aacff50dfa89 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
@@ -11,7 +11,7 @@ 
 #include "selftest_rc6.h"
 
 #include "selftests/i915_random.h"
-#include "selftests/librapl.h"
+#include "selftests/libpower.h"
 
 static u64 rc6_residency(struct intel_rc6 *rc6)
 {
@@ -51,7 +51,7 @@  int live_rc6_manual(void *arg)
 	if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915))
 		return 0;
 
-	has_power = librapl_supported(gt->i915);
+	has_power = libpower_supported(gt->i915);
 	wakeref = intel_runtime_pm_get(gt->uncore->rpm);
 
 	/* Force RC6 off for starters */
@@ -61,9 +61,9 @@  int live_rc6_manual(void *arg)
 	res[0] = rc6_residency(rc6);
 
 	dt = ktime_get();
-	rc0_power = librapl_energy_uJ();
+	rc0_power = libpower_get_energy_uJ();
 	msleep(250);
-	rc0_power = librapl_energy_uJ() - rc0_power;
+	rc0_power = libpower_get_energy_uJ() - rc0_power;
 	dt = ktime_sub(ktime_get(), dt);
 	res[1] = rc6_residency(rc6);
 	if ((res[1] - res[0]) >> 10) {
@@ -89,9 +89,9 @@  int live_rc6_manual(void *arg)
 	res[0] = rc6_residency(rc6);
 	intel_uncore_forcewake_flush(rc6_to_uncore(rc6), FORCEWAKE_ALL);
 	dt = ktime_get();
-	rc6_power = librapl_energy_uJ();
+	rc6_power = libpower_get_energy_uJ();
 	msleep(100);
-	rc6_power = librapl_energy_uJ() - rc6_power;
+	rc6_power = libpower_get_energy_uJ() - rc6_power;
 	dt = ktime_sub(ktime_get(), dt);
 	res[1] = rc6_residency(rc6);
 	if (res[1] == res[0]) {
diff --git a/drivers/gpu/drm/i915/gt/selftest_rps.c b/drivers/gpu/drm/i915/gt/selftest_rps.c
index 99a372486fb7..3287698c655b 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rps.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rps.c
@@ -19,7 +19,7 @@ 
 #include "selftest_rps.h"
 #include "selftests/igt_flush_test.h"
 #include "selftests/igt_spinner.h"
-#include "selftests/librapl.h"
+#include "selftests/libpower.h"
 
 /* Try to isolate the impact of cstates from determing frequency response */
 #define CPU_LATENCY 0 /* -1 to disable pm_qos, 0 to disable cstates */
@@ -1099,9 +1099,9 @@  static u64 __measure_power(int duration_ms)
 	u64 dE, dt;
 
 	dt = ktime_get();
-	dE = librapl_energy_uJ();
+	dE = libpower_get_energy_uJ();
 	usleep_range(1000 * duration_ms, 2000 * duration_ms);
-	dE = librapl_energy_uJ() - dE;
+	dE = libpower_get_energy_uJ() - dE;
 	dt = ktime_get() - dt;
 
 	return div64_u64(1000 * 1000 * dE, dt);
@@ -1147,7 +1147,7 @@  int live_rps_power(void *arg)
 	if (!intel_rps_is_enabled(rps) || GRAPHICS_VER(gt->i915) < 6)
 		return 0;
 
-	if (!librapl_supported(gt->i915))
+	if (!libpower_supported(gt->i915))
 		return 0;
 
 	if (igt_spinner_init(&spin, gt))
diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c
index 4c6e9257e593..494e7a486b07 100644
--- a/drivers/gpu/drm/i915/gt/selftest_slpc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c
@@ -161,7 +161,7 @@  static int slpc_power(struct intel_gt *gt, struct intel_engine_cs *engine)
 	 * actually saves power. Let's see if our RAPL measurement supports
 	 * that theory.
 	 */
-	if (!librapl_supported(gt->i915))
+	if (!libpower_supported(gt->i915))
 		return 0;
 
 	min.freq = slpc->min_freq;
diff --git a/drivers/gpu/drm/i915/selftests/librapl.c b/drivers/gpu/drm/i915/selftests/libpower.c
similarity index 69%
rename from drivers/gpu/drm/i915/selftests/librapl.c
rename to drivers/gpu/drm/i915/selftests/libpower.c
index eb03b5b28bad..c66e993c5f85 100644
--- a/drivers/gpu/drm/i915/selftests/librapl.c
+++ b/drivers/gpu/drm/i915/selftests/libpower.c
@@ -1,23 +1,23 @@ 
 // SPDX-License-Identifier: MIT
 /*
- * Copyright © 2020 Intel Corporation
+ * Copyright © 2022 Intel Corporation
  */
 
 #include <asm/msr.h>
 
 #include "i915_drv.h"
-#include "librapl.h"
+#include "libpower.h"
 
-bool librapl_supported(const struct drm_i915_private *i915)
+bool libpower_supported(const struct drm_i915_private *i915)
 {
 	/* Discrete cards require hwmon integration */
 	if (IS_DGFX(i915))
 		return false;
 
-	return librapl_energy_uJ();
+	return libpower_get_energy_uJ();
 }
 
-u64 librapl_energy_uJ(void)
+u64 libpower_get_energy_uJ(void)
 {
 	unsigned long long power;
 	u32 units;
diff --git a/drivers/gpu/drm/i915/selftests/libpower.h b/drivers/gpu/drm/i915/selftests/libpower.h
new file mode 100644
index 000000000000..5352981eb946
--- /dev/null
+++ b/drivers/gpu/drm/i915/selftests/libpower.h
@@ -0,0 +1,17 @@ 
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef SELFTEST_LIBPOWER_H
+#define SELFTEST_LIBPOWER_H
+
+#include <linux/types.h>
+
+struct drm_i915_private;
+
+bool libpower_supported(const struct drm_i915_private *i915);
+
+u64 libpower_get_energy_uJ(void);
+
+#endif /* SELFTEST_LIBPOWER_H */
diff --git a/drivers/gpu/drm/i915/selftests/librapl.h b/drivers/gpu/drm/i915/selftests/librapl.h
deleted file mode 100644
index e3b24fad0a7a..000000000000
--- a/drivers/gpu/drm/i915/selftests/librapl.h
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2020 Intel Corporation
- */
-
-#ifndef SELFTEST_LIBRAPL_H
-#define SELFTEST_LIBRAPL_H
-
-#include <linux/types.h>
-
-struct drm_i915_private;
-
-bool librapl_supported(const struct drm_i915_private *i915);
-
-u64 librapl_energy_uJ(void);
-
-#endif /* SELFTEST_LIBRAPL_H */