Re: [PATCH] S/390: Add support for IBM zEnterprise EC12 - user space

[Andreas K. <kr...@li...>]

On 10/01/13 17:29, Maynard Johnson wrote:
> On 01/10/2013 09:47 AM, Andreas Krebbel wrote:
>> This patch adds support for the latest release of the
>> IBM mainframe series - the IBM zEnterprise EC12 (zEC12).
>>
>> The CPU measurement facility didn't change.  So only the new CPU type
>> has to be tolerated.
> Andreas,
> Patch looks good with the following exceptions:
> 
>   - Line 92: space before tab in indent.  This is your addition to libop/op_events.c:op_default_event.
>     As a matter of fact, the two existing entries for CPU_S390_Z10 and CPU_S390_Z196 also have spaces
>     instead of indents.
>   - The link http://www-01.ibm.com/support/docview.wss doesn't seem to be valid.

The link is split into two separate strings. You probably missed copying the second part starting
with ?uid=. The full link is:
http://www-01.ibm.com/support/docview.wss?uid=isg26fcd1cc32246f4c8852574ce0044734a

-Andreas-

> 
> -Maynard
>>
>> Signed-off-by: Andreas Krebbel <kr...@li...>
>> ---
>>  events/Makefile.am           |    3 ++-
>>  events/s390/zEC12/events     |    7 +++++++
>>  events/s390/zEC12/unit_masks |    7 +++++++
>>  libop/op_cpu_type.c          |    1 +
>>  libop/op_cpu_type.h          |    1 +
>>  libop/op_events.c            |    1 +
>>  utils/ophelp.c               |    1 +
>>  7 files changed, 20 insertions(+), 1 deletions(-)
>>  create mode 100644 events/s390/zEC12/events
>>  create mode 100644 events/s390/zEC12/unit_masks
>>
>> diff --git a/events/Makefile.am b/events/Makefile.am
>> index 758925d..9191a83 100644
>> --- a/events/Makefile.am
>> +++ b/events/Makefile.am
>> @@ -78,7 +78,8 @@ event_files = \
>>  	tile/tilepro/events tile/tilepro/unit_masks \
>>  	tile/tilegx/events tile/tilegx/unit_masks \
>>  	s390/z10/events s390/z10/unit_masks \
>> -	s390/z196/events s390/z196/unit_masks
>> +	s390/z196/events s390/z196/unit_masks \
>> +	s390/zEC12/events s390/zEC12/unit_masks
>>
>>  install-data-local:
>>  	for i in ${event_files} ; do \
>> diff --git a/events/s390/zEC12/events b/events/s390/zEC12/events
>> new file mode 100644
>> index 0000000..3a167f7
>> --- /dev/null
>> +++ b/events/s390/zEC12/events
>> @@ -0,0 +1,7 @@
>> +# Copyright OProfile authors
>> +# Copyright (c) International Business Machines, 2013.
>> +# Contributed by Andreas Krebbel <kr...@li...>.
>> +#
>> +# IBM Enterprise EC12 Basic Mode Sampling events
>> +#
>> +event:0x00 counters:0 um:zero minimum:19264 name:HWSAMPLING : Sampling using Basic Mode Hardware Sampling
>> diff --git a/events/s390/zEC12/unit_masks b/events/s390/zEC12/unit_masks
>> new file mode 100644
>> index 0000000..cfc4dc1
>> --- /dev/null
>> +++ b/events/s390/zEC12/unit_masks
>> @@ -0,0 +1,7 @@
>> +# Copyright OProfile authors
>> +# Copyright (c) International Business Machines, 2013.
>> +# Contributed by Andreas Krebbel <kr...@li...>.
>> +#
>> +# S/390 Basic Mode Hardware Sampling unit masks
>> +#
>> +include:s390/z10
>> diff --git a/libop/op_cpu_type.c b/libop/op_cpu_type.c
>> index a54b2a9..8114f14 100644
>> --- a/libop/op_cpu_type.c
>> +++ b/libop/op_cpu_type.c
>> @@ -108,6 +108,7 @@ static struct cpu_descr const cpu_descrs[MAX_CPU_TYPE] = {
>>  	{ "ARM Cortex-A7", "arm/armv7-ca7", CPU_ARM_V7_CA7, 5 },
>>  	{ "ARM Cortex-A15", "arm/armv7-ca15", CPU_ARM_V7_CA15, 7 },
>>  	{ "Intel Haswell microarchitecture", "i386/haswell", CPU_HASWELL, 4 },
>> +	{ "IBM zEnterprise EC12", "s390/zEC12", CPU_S390_ZEC12, 1 },
>>  };
>>   
>>  static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
>> diff --git a/libop/op_cpu_type.h b/libop/op_cpu_type.h
>> index 1d5cb64..3d58f3e 100644
>> --- a/libop/op_cpu_type.h
>> +++ b/libop/op_cpu_type.h
>> @@ -101,6 +101,7 @@ typedef enum {
>>  	CPU_ARM_V7_CA7, /**< ARM Cortex-A7 */
>>  	CPU_ARM_V7_CA15, /**< ARM Cortex-A15 */
>>  	CPU_HASWELL, /** < Intel Haswell microarchitecture */
>> +	CPU_S390_ZEC12, /**< IBM zEnterprise EC12 */
>>  	MAX_CPU_TYPE
>>  } op_cpu;
>>
>> diff --git a/libop/op_events.c b/libop/op_events.c
>> index 6b02fcc..5327cd7 100644
>> --- a/libop/op_events.c
>> +++ b/libop/op_events.c
>> @@ -1191,6 +1191,7 @@ void op_default_event(op_cpu cpu_type, struct op_default_event_descr * descr)
>>  			break;
>>    	        case CPU_S390_Z10:
>>    	        case CPU_S390_Z196:
>> +  	        case CPU_S390_ZEC12:
>>   			if (op_get_nr_counters(cpu_type) > 1) {
>>   				descr->name = "HWSAMPLING";
>>   				descr->count = 4127518;
>> diff --git a/utils/ophelp.c b/utils/ophelp.c
>> index f48697b..2cd3f2a 100644
>> --- a/utils/ophelp.c
>> +++ b/utils/ophelp.c
>> @@ -772,6 +772,7 @@ int main(int argc, char const * argv[])
>>
>>  	case CPU_S390_Z10:
>>  	case CPU_S390_Z196:
>> +	case CPU_S390_ZEC12:
>>  		event_doc = "IBM System z CPU Measurement Facility\n"
>>  			"http://www-01.ibm.com/support/docview.wss"
>>  			"?uid=isg26fcd1cc32246f4c8852574ce0044734a\n";
>