Re: [PATCH] s390: Add support for z13

On 05/11/2016 10:15 AM, Andreas Arnez wrote:
> So far oprofile supported z Systems (s390) machines up to zEC12.  This
> adds support for z13 as well.

Hi,

The patch is missing the events/z13/events and events/z13/unit_masks files.  Please revise the patch to add those files and resend the patch.
The rest of the patch look reasonable.

-Will
> 
> Signed-off-by: Andreas Arnez <[email protected]>
> ---
>  events/Makefile.am  | 3 ++-
>  libop/op_cpu_type.c | 3 +++
>  libop/op_cpu_type.h | 1 +
>  libop/op_events.c   | 1 +
>  utils/ophelp.c      | 1 +
>  5 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/events/Makefile.am b/events/Makefile.am
> index 677b05f..29d4b5f 100644
> --- a/events/Makefile.am
> +++ b/events/Makefile.am
> @@ -81,7 +81,8 @@ event_files = \
>  	tile/tilegx/events tile/tilegx/unit_masks \
>  	s390/z10/events s390/z10/unit_masks \
>  	s390/z196/events s390/z196/unit_masks \
> -	s390/zEC12/events s390/zEC12/unit_masks
> +	s390/zEC12/events s390/zEC12/unit_masks \
> +	s390/z13/events s390/z13/unit_masks
>  
>  install-data-local:
>  	for i in ${event_files} ; do \
> diff --git a/libop/op_cpu_type.c b/libop/op_cpu_type.c
> index 7bdde53..e70e4f6 100644
> --- a/libop/op_cpu_type.c
> +++ b/libop/op_cpu_type.c
> @@ -123,6 +123,7 @@ static struct cpu_descr const cpu_descrs[MAX_CPU_TYPE] = {
>  	{ "ARM Cortex-A53", "arm/armv8-ca53", CPU_ARM_V8_CA53, 6},
>  	{ "Intel Skylake microarchitecture", "i386/skylake", CPU_SKYLAKE, 4 },
>  	{ "Intel Goldmont microarchitecture", "i386/goldmont", CPU_GOLDMONT, 4 },
> +	{ "IBM z13", "s390/z13", CPU_S390_Z13, 1 },
>  };
>   
>  static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
> @@ -680,6 +681,8 @@ static op_cpu _get_s390_cpu_type(void)
>  	case 2827:
>  	case 2828:
>  		return CPU_S390_ZEC12;
> +	case 2964:
> +		return CPU_S390_Z13;
>  	}
>  	return CPU_NO_GOOD;
>  }
> diff --git a/libop/op_cpu_type.h b/libop/op_cpu_type.h
> index 98289c5..4f896a0 100644
> --- a/libop/op_cpu_type.h
> +++ b/libop/op_cpu_type.h
> @@ -103,6 +103,7 @@ typedef enum {
>  	CPU_ARM_V8_CA53, /* ARM Cortex-A53 */
>  	CPU_SKYLAKE, /** < Intel Skylake microarchitecture */
>  	CPU_GOLDMONT, /** < Intel Goldmont microarchitecture */
> +	CPU_S390_Z13, /** < IBM z13 */
>  	MAX_CPU_TYPE
>  } op_cpu;
>  
> diff --git a/libop/op_events.c b/libop/op_events.c
> index cdd0409..ea6ced3 100644
> --- a/libop/op_events.c
> +++ b/libop/op_events.c
> @@ -1307,6 +1307,7 @@ void op_default_event(op_cpu cpu_type, struct op_default_event_descr * descr)
>  		case CPU_S390_Z10:
>  		case CPU_S390_Z196:
>  		case CPU_S390_ZEC12:
> +		case CPU_S390_Z13:
>  			descr->name = "CPU_CYCLES";
>  			descr->count = 4127518;
>  			break;
> diff --git a/utils/ophelp.c b/utils/ophelp.c
> index 5821593..3cb1c08 100644
> --- a/utils/ophelp.c
> +++ b/utils/ophelp.c
> @@ -779,6 +779,7 @@ int main(int argc, char const * argv[])
>  	case CPU_S390_Z10:
>  	case CPU_S390_Z196:
>  	case CPU_S390_ZEC12:
> +	case CPU_S390_Z13:
>  		event_doc = "IBM System z CPU Measurement Facility\n"
>  				"http://www-01.ibm.com/support/docview.wss"
>  				"?uid=isg26fcd1cc32246f4c8852574ce0044734a\n";
> 


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot