[PATCH v2 2/2] drm/xe/rtp: Prefer helper macros from xe_args.h

[Lucas De Marchi]

On Thu, May 02, 2024 at 09:56:19PM GMT, Michal Wajdeczko wrote:
>Some custom implementation can be replaced with generic macros
>from the linux/args.h or xe_args.h.
>
>Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>

nice cleanup.

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

thanks
Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_rtp.h         |  4 ++--
> drivers/gpu/drm/xe/xe_rtp_helpers.h | 26 ++++++++++----------------
> 2 files changed, 12 insertions(+), 18 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_rtp.h b/drivers/gpu/drm/xe/xe_rtp.h
>index c56fedd126e6..337b1ef1959c 100644
>--- a/drivers/gpu/drm/xe/xe_rtp.h
>+++ b/drivers/gpu/drm/xe/xe_rtp.h
>@@ -341,7 +341,7 @@ struct xe_reg_sr;
>  *	};
>  */
> #define XE_RTP_RULES(...)							\
>-	.n_rules = _XE_COUNT_ARGS(__VA_ARGS__),					\
>+	.n_rules = COUNT_ARGS(__VA_ARGS__),					\
> 	.rules = (const struct xe_rtp_rule[]) {					\
> 		XE_RTP_PASTE_FOREACH(RULE_, COMMA, (__VA_ARGS__))	\
> 	}
>@@ -366,7 +366,7 @@ struct xe_reg_sr;
>  *	};
>  */
> #define XE_RTP_ACTIONS(...)							\
>-	.n_actions = _XE_COUNT_ARGS(__VA_ARGS__),				\
>+	.n_actions = COUNT_ARGS(__VA_ARGS__),					\
> 	.actions = (const struct xe_rtp_action[]) {				\
> 		XE_RTP_PASTE_FOREACH(ACTION_, COMMA, (__VA_ARGS__))	\
> 	}
>diff --git a/drivers/gpu/drm/xe/xe_rtp_helpers.h b/drivers/gpu/drm/xe/xe_rtp_helpers.h
>index 181b6290fac3..8129d6d9ef37 100644
>--- a/drivers/gpu/drm/xe/xe_rtp_helpers.h
>+++ b/drivers/gpu/drm/xe/xe_rtp_helpers.h
>@@ -10,22 +10,16 @@
> #error "This header is supposed to be included by xe_rtp.h only"
> #endif
>
>+#include "xe_args.h"
>+
> /*
>  * Helper macros - not to be used outside this header.
>  */
> #define _XE_ESC(...) __VA_ARGS__
>-#define _XE_COUNT_ARGS(...) _XE_ESC(__XE_COUNT_ARGS(__VA_ARGS__, 5, 4, 3, 2, 1,))
>-#define __XE_COUNT_ARGS(_, _5, _4, _3, _2, X_, ...) X_
>
>-#define _XE_FIRST(...) _XE_ESC(__XE_FIRST(__VA_ARGS__,))
>-#define __XE_FIRST(x_, ...) x_
>-#define _XE_TUPLE_TAIL(...) _XE_ESC(__XE_TUPLE_TAIL(__VA_ARGS__))
>-#define __XE_TUPLE_TAIL(x_, ...) (__VA_ARGS__)
>+#define _XE_TUPLE_TAIL(...) (DROP_FIRST(__VA_ARGS__))
>
>-#define _XE_DROP_FIRST(x_, ...) __VA_ARGS__
>-
>-#define _XE_RTP_CONCAT(a, b) __XE_RTP_CONCAT(a, b)
>-#define __XE_RTP_CONCAT(a, b) XE_RTP_ ## a ## b
>+#define _XE_RTP_CONCAT(a, b) CONCATENATE(XE_RTP_, CONCATENATE(a, b))
>
> #define __XE_RTP_PASTE_SEP_COMMA		,
> #define __XE_RTP_PASTE_SEP_BITWISE_OR		|
>@@ -59,11 +53,11 @@
>  *
>  *	XE_RTP_TEST_FOO BANANA XE_RTP_TEST_BAR
>  */
>-#define XE_RTP_PASTE_FOREACH(prefix_, sep_, args_) _XE_ESC(_XE_RTP_CONCAT(PASTE_, _XE_COUNT_ARGS args_)(prefix_, sep_, args_))
>-#define XE_RTP_PASTE_1(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, _XE_FIRST args_)
>-#define XE_RTP_PASTE_2(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, _XE_FIRST args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_1(prefix_, sep_, _XE_TUPLE_TAIL args_)
>-#define XE_RTP_PASTE_3(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, _XE_FIRST args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_2(prefix_, sep_, _XE_TUPLE_TAIL args_)
>-#define XE_RTP_PASTE_4(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, _XE_FIRST args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_3(prefix_, sep_, _XE_TUPLE_TAIL args_)
>+#define XE_RTP_PASTE_FOREACH(prefix_, sep_, args_) _XE_RTP_CONCAT(PASTE_, COUNT_ARGS args_)(prefix_, sep_, args_)
>+#define XE_RTP_PASTE_1(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, PICK_FIRST args_)
>+#define XE_RTP_PASTE_2(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, PICK_FIRST args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_1(prefix_, sep_, _XE_TUPLE_TAIL args_)
>+#define XE_RTP_PASTE_3(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, PICK_FIRST args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_2(prefix_, sep_, _XE_TUPLE_TAIL args_)
>+#define XE_RTP_PASTE_4(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, PICK_FIRST args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_3(prefix_, sep_, _XE_TUPLE_TAIL args_)
>
> /*
>  * XE_RTP_DROP_CAST - Drop cast to convert a compound statement to a initializer
>@@ -76,6 +70,6 @@
>  *
>  *	{ .a = 10 }
>  */
>-#define XE_RTP_DROP_CAST(...) _XE_ESC(_XE_DROP_FIRST _XE_ESC __VA_ARGS__)
>+#define XE_RTP_DROP_CAST(...) _XE_ESC(DROP_FIRST _XE_ESC __VA_ARGS__)
>
> #endif
>-- 
>2.43.0
>