From b82733ab25281cf281c6130ed7110981e2734dda Mon Sep 17 00:00:00 2001 From: Cristian Dumitrescu Date: Mon, 13 Sep 2021 17:44:29 +0100 Subject: [PATCH] pipeline: create inline functions for move instruction Create inline functions for the move instruction. Signed-off-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_pipeline.c | 26 +++--------- lib/pipeline/rte_swx_pipeline_internal.h | 53 ++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 21 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index c9e29230c2..72606f1a06 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -2407,10 +2407,7 @@ instr_mov_exec(struct rte_swx_pipeline *p) struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - TRACE("[Thread %2u] mov\n", - p->thread_id); - - MOV(t, ip); + __instr_mov_exec(p, t, ip); /* Thread. */ thread_ip_inc(p); @@ -2422,10 +2419,7 @@ instr_mov_mh_exec(struct rte_swx_pipeline *p) struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - TRACE("[Thread %2u] mov (mh)\n", - p->thread_id); - - MOV_MH(t, ip); + __instr_mov_mh_exec(p, t, ip); /* Thread. */ thread_ip_inc(p); @@ -2437,10 +2431,7 @@ instr_mov_hm_exec(struct rte_swx_pipeline *p) struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - TRACE("[Thread %2u] mov (hm)\n", - p->thread_id); - - MOV_HM(t, ip); + __instr_mov_hm_exec(p, t, ip); /* Thread. */ thread_ip_inc(p); @@ -2452,10 +2443,7 @@ instr_mov_hh_exec(struct rte_swx_pipeline *p) struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - TRACE("[Thread %2u] mov (hh)\n", - p->thread_id); - - MOV_HH(t, ip); + __instr_mov_hh_exec(p, t, ip); /* Thread. */ thread_ip_inc(p); @@ -2467,11 +2455,7 @@ instr_mov_i_exec(struct rte_swx_pipeline *p) struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - TRACE("[Thread %2u] mov m.f %" PRIx64 "\n", - p->thread_id, - ip->mov.src_val); - - MOV_I(t, ip); + __instr_mov_i_exec(p, t, ip); /* Thread. */ thread_ip_inc(p); diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index 14d6d88344..1bf94159a9 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -2058,4 +2058,57 @@ __instr_extern_func_exec(struct rte_swx_pipeline *p __rte_unused, return done; } +/* + * mov. + */ +static inline void +__instr_mov_exec(struct rte_swx_pipeline *p __rte_unused, + struct thread *t, + const struct instruction *ip) +{ + TRACE("[Thread %2u] mov\n", p->thread_id); + + MOV(t, ip); +} + +static inline void +__instr_mov_mh_exec(struct rte_swx_pipeline *p __rte_unused, + struct thread *t, + const struct instruction *ip) +{ + TRACE("[Thread %2u] mov (mh)\n", p->thread_id); + + MOV_MH(t, ip); +} + +static inline void +__instr_mov_hm_exec(struct rte_swx_pipeline *p __rte_unused, + struct thread *t, + const struct instruction *ip) +{ + TRACE("[Thread %2u] mov (hm)\n", p->thread_id); + + MOV_HM(t, ip); +} + +static inline void +__instr_mov_hh_exec(struct rte_swx_pipeline *p __rte_unused, + struct thread *t, + const struct instruction *ip) +{ + TRACE("[Thread %2u] mov (hh)\n", p->thread_id); + + MOV_HH(t, ip); +} + +static inline void +__instr_mov_i_exec(struct rte_swx_pipeline *p __rte_unused, + struct thread *t, + const struct instruction *ip) +{ + TRACE("[Thread %2u] mov m.f %" PRIx64 "\n", p->thread_id, ip->mov.src_val); + + MOV_I(t, ip); +} + #endif -- 2.20.1