Skip to contentSkip to conversation

powerpc: adjust oprofile_cpu_type

PATCH In review Mike Wolf 3 participants 5 messages Apr 22, 2009 – Apr 23, 2009 PowerPC

lore
Share & tools
lore

Mike Wolf

author
#0 lore raw

PATCH 1/1 powerpc: adjust oprofile_cpu_type

Resending. the patch was munged last time.

Oprofile is changing the naming it is using for the compatibility modes. Instead of having compat-power<x>, oprofile will go to family naming convention and use compat-v<x>. Currently only compat-v1 will be defined.

----

arch/powerpc/kernel/cputable.c +9 -4
@@ -382,7 +382,8 @@
 		.icache_bsize		= 128,
 		.dcache_bsize		= 128,
 		.machine_check		= machine_check_generic,
-		.oprofile_cpu_type	= "ppc64/compat-power5+",
+		.oprofile_cpu_type	= "ppc64/compat-v1",
+		.oprofile_type		= PPC_OPROFILE_POWER4,
 		.platform		= "power5+",
 	},
 	{	/* Power6 */
@@ -416,7 +417,8 @@
 		.icache_bsize		= 128,
 		.dcache_bsize		= 128,
 		.machine_check		= machine_check_generic,
-		.oprofile_cpu_type	= "ppc64/compat-power6",
+		.oprofile_cpu_type	= "ppc64/compat-v1",
+		.oprofile_type		= PPC_OPROFILE_POWER4,
 		.platform		= "power6",
 	},
 	{	/* 2.06-compliant processor, i.e. Power7 "architected" mode */
@@ -429,7 +431,8 @@
 		.icache_bsize		= 128,
 		.dcache_bsize		= 128,
 		.machine_check		= machine_check_generic,
-		.oprofile_cpu_type	= "ppc64/compat-power7",
+		.oprofile_type		= PPC_OPROFILE_POWER4,
+		.oprofile_cpu_type	= "ppc64/compat-v1",
 		.platform		= "power7",
 	},
 	{	/* Power7 */
@@ -1833,8 +1836,10 @@
 		 * and, in that case, keep the current value for
 		 * oprofile_cpu_type.
 		 */
-		if (old.oprofile_cpu_type == NULL)
+		if (old.oprofile_cpu_type == NULL) {
 			t->oprofile_cpu_type = s->oprofile_cpu_type;
+			t->oprofile_type = s->oprofile_type;
+		}
 	}
 
 	*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
#1 lore raw
Quoted 11 lines · Mike Wolf

Resending. the patch was munged last time.

Oprofile is changing the naming it is using for the compatibility modes. Instead of having compat-power<x>, oprofile will go to family naming convention and use compat-v<x>. Currently only compat-v1 will be defined.

----

Any ideas what's going on w/ppc32 and these names?

- k

#2 lore raw
In reply to Mike Wolf
Quoted 7 lines · Mike Wolf

Resending. the patch was munged last time.

Oprofile is changing the naming it is using for the compatibility modes. Instead of having compat-power<x>, oprofile will go to family naming convention and use compat-v<x>. Currently only compat-v1 will be defined.

Compat V1 of what? powerpc64? IBM powerpc64 PMC? The performance monitors are not architected, to give them a version number without vendor information seems weird.

Also, doesn't this break compatibility with existing userspace tools?

-Olof

author
#3 lore raw
Quoted 10 lines · Olof Johansson
Quoted 7 lines · Mike Wolf

Resending. the patch was munged last time.

Oprofile is changing the naming it is using for the compatibility modes. Instead of having compat-power<x>, oprofile will go to family naming convention and use compat-v<x>. Currently only compat-v1 will be defined.

Compat V1 of what? powerpc64? IBM powerpc64 PMC?

IBM powerpc PMC

Quoted 3 lines

The performance
monitors are not architected, to give them a version number without vendor information seems weird.

The current ones all fall into one family and they may be architected in the future.

Quoted 2 lines

Also, doesn't this break compatibility with existing userspace tools?

AFAIK there is nothing else that uses these. Oprofile patch was rejected and this new naming was suggested from that community.

Mike

#4 lore raw
Quoted 5 lines · Mike Wolf
Quoted 4 lines · Olof Johansson
Quoted 3 lines · Mike Wolf

Resending. the patch was munged last time.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

Oprofile is changing the naming it is using for the compatibility modes. Instead of having compat-power<x>, oprofile will go to family naming convention and use compat-v<x>. Currently only compat-v1 will be defined.

Compat V1 of what? powerpc64? IBM powerpc64 PMC?

IBM powerpc PMC

Sounds like it'd be appropriate to have an ibm somewhere in the version string then.

Quoted 5 lines
Quoted 3 lines

The performance
monitors are not architected, to give them a version number without vendor information seems weird.

The current ones all fall into one family and they may be architected in the future.

Not all powerpc PMC implementations do, not even all ppc64 ones -- PA6T implements a completely different performance monitor.

The current IBM PMC is included in the appendix of the architecture as a suggestion on how to implement it, but it is explicitly specified as being implementation dependent in the architecture.

Quoted 3 lines
Quoted 1 line

Also, doesn't this break compatibility with existing userspace tools?

AFAIK there is nothing else that uses these. Oprofile patch was rejected and this new naming was suggested from that community.

Ok, as long as you are 100% sure there are no proprietary users either.

-Olof