Re: [PATCH v2 2/7] target/ppc: powerpc_excp: Keep 60x soft MMU logs active

2022-01-06 Thread Richard Henderson 

On 1/5/22 12:40 PM, Fabiano Rosas wrote:

Remove the compile time definition and make the logging be controlled
by the `-d mmu` option in the cmdline.

Signed-off-by: Fabiano Rosas 
Reviewed-by: Cédric Le Goater 
---
  target/ppc/excp_helper.c | 15 ++-
  1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 2c5d5470de..ce86b2ae37 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -30,8 +30,6 @@
  #include "exec/cpu_ldst.h"
  #endif
  
-/* #define DEBUG_SOFTWARE_TLB */

-
  
/*/
  /* Exception processing */
  #if !defined(CONFIG_USER_ONLY)
@@ -137,7 +135,6 @@ static void dump_hcall(CPUPPCState *env)
  
  static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp)

  {
-#if defined(DEBUG_SOFTWARE_TLB)
  const char *es;
  target_ulong *miss, *cmp;
  int en;
@@ -161,12 +158,12 @@ static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int 
excp)
  miss = &env->spr[SPR_DMISS];
  cmp = &env->spr[SPR_DCMP];
  }
-qemu_log("6xx %sTLB miss: %cM " TARGET_FMT_lx " %cC "
- TARGET_FMT_lx " H1 " TARGET_FMT_lx " H2 "
- TARGET_FMT_lx " %08x\n", es, en, *miss, en, *cmp,
- env->spr[SPR_HASH1], env->spr[SPR_HASH2],
- env->error_code);
-#endif
+
+qemu_log_mask(CPU_LOG_MMU, "6xx %sTLB miss: %cM " TARGET_FMT_lx " %cC "
+  TARGET_FMT_lx " H1 " TARGET_FMT_lx " H2 "
+  TARGET_FMT_lx " %08x\n", es, en, *miss, en, *cmp,
+  env->spr[SPR_HASH1], env->spr[SPR_HASH2],
+  env->error_code);


Ah, then my comment wrt patch 1 applies to this one -- use the proper filter function at 
the top of this one, before all of the data collection for the actual logging.



r~

Re: [PATCH v2 2/7] target/ppc: powerpc_excp: Keep 60x soft MMU logs active

2022-01-05 Thread David Gibson 
On Wed, Jan 05, 2022 at 05:40:24PM -0300, Fabiano Rosas wrote:
> Remove the compile time definition and make the logging be controlled
> by the `-d mmu` option in the cmdline.
> 
> Signed-off-by: Fabiano Rosas 
> Reviewed-by: Cédric Le Goater 

Reviewed-by: David Gibson 

I'm guessing from the text here that this logging is specific to the
60x software TLB implementation rather than (say) the 40x, 44x, 8xx or
freescale implementations.  Changing the function name to reflect that
might be a nice future change.

> ---
>  target/ppc/excp_helper.c | 15 ++-
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 2c5d5470de..ce86b2ae37 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -30,8 +30,6 @@
>  #include "exec/cpu_ldst.h"
>  #endif
>  
> -/* #define DEBUG_SOFTWARE_TLB */
> -
>  
> /*/
>  /* Exception processing */
>  #if !defined(CONFIG_USER_ONLY)
> @@ -137,7 +135,6 @@ static void dump_hcall(CPUPPCState *env)
>  
>  static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp)
>  {
> -#if defined(DEBUG_SOFTWARE_TLB)
>  const char *es;
>  target_ulong *miss, *cmp;
>  int en;
> @@ -161,12 +158,12 @@ static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int 
> excp)
>  miss = &env->spr[SPR_DMISS];
>  cmp = &env->spr[SPR_DCMP];
>  }
> -qemu_log("6xx %sTLB miss: %cM " TARGET_FMT_lx " %cC "
> - TARGET_FMT_lx " H1 " TARGET_FMT_lx " H2 "
> - TARGET_FMT_lx " %08x\n", es, en, *miss, en, *cmp,
> - env->spr[SPR_HASH1], env->spr[SPR_HASH2],
> - env->error_code);
> -#endif
> +
> +qemu_log_mask(CPU_LOG_MMU, "6xx %sTLB miss: %cM " TARGET_FMT_lx " %cC "
> +  TARGET_FMT_lx " H1 " TARGET_FMT_lx " H2 "
> +  TARGET_FMT_lx " %08x\n", es, en, *miss, en, *cmp,
> +  env->spr[SPR_HASH1], env->spr[SPR_HASH2],
> +  env->error_code);
>  }
>  
>  

-- 
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson


signature.asc
Description: PGP signature

[PATCH v2 2/7] target/ppc: powerpc_excp: Keep 60x soft MMU logs active

2022-01-05 Thread Fabiano Rosas 
Remove the compile time definition and make the logging be controlled
by the `-d mmu` option in the cmdline.

Signed-off-by: Fabiano Rosas 
Reviewed-by: Cédric Le Goater 
---
 target/ppc/excp_helper.c | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 2c5d5470de..ce86b2ae37 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -30,8 +30,6 @@
 #include "exec/cpu_ldst.h"
 #endif
 
-/* #define DEBUG_SOFTWARE_TLB */
-
 /*/
 /* Exception processing */
 #if !defined(CONFIG_USER_ONLY)
@@ -137,7 +135,6 @@ static void dump_hcall(CPUPPCState *env)
 
 static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp)
 {
-#if defined(DEBUG_SOFTWARE_TLB)
 const char *es;
 target_ulong *miss, *cmp;
 int en;
@@ -161,12 +158,12 @@ static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int 
excp)
 miss = &env->spr[SPR_DMISS];
 cmp = &env->spr[SPR_DCMP];
 }
-qemu_log("6xx %sTLB miss: %cM " TARGET_FMT_lx " %cC "
- TARGET_FMT_lx " H1 " TARGET_FMT_lx " H2 "
- TARGET_FMT_lx " %08x\n", es, en, *miss, en, *cmp,
- env->spr[SPR_HASH1], env->spr[SPR_HASH2],
- env->error_code);
-#endif
+
+qemu_log_mask(CPU_LOG_MMU, "6xx %sTLB miss: %cM " TARGET_FMT_lx " %cC "
+  TARGET_FMT_lx " H1 " TARGET_FMT_lx " H2 "
+  TARGET_FMT_lx " %08x\n", es, en, *miss, en, *cmp,
+  env->spr[SPR_HASH1], env->spr[SPR_HASH2],
+  env->error_code);
 }
 
 
-- 
2.33.1