Issue 5535046: [google][4.6]Add new target builtin to check for amdfam15h processors

Can't Edit
Can't Publish+Mail
Start Review

Created:
12 years, 3 months ago by Sriraman

Modified:
12 years, 3 months ago

Reviewers:
davidxl, Diego Novillo, pinskia

CC:
michiel.vermeulen_amd.com, gcc-patches_gcc.gnu.org

Base URL:
svn+ssh://gcc.gnu.org/svn/gcc/branches/google/gcc-4_6/

Visibility:
Public.

Patch Set 2 : [google][4.6]Add new target builtin to check for amdfam15h processors #

Created: 12 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+94 lines, -49 lines)			Patch
M	gcc/config/i386/i386.c	View		5 chunks	+44 lines, -24 lines	0 comments	Download
M	gcc/testsuite/gcc.target/i386/builtin_target.c	View	1	1 chunk	+4 lines, -0 lines	0 comments	Download
M	libgcc/config/i386/i386-cpuinfo.c	View	1	6 chunks	+46 lines, -25 lines	0 comments	Download

Messages

Total messages: 9

Expand All Messages | Collapse All Messages

Sriraman

This patch adds a new target builtin, __builtin_cpu_is_amdfam15, to check for AMD Family 15h processors. ...

12 years, 3 months ago (2012-01-10 22:11:52 UTC) #1

This patch adds a new target builtin, __builtin_cpu_is_amdfam15, to check for
AMD Family 15h processors.

	* i386-cpuinfo.c (__cpu_is_amdfam15): New member in __cpu_model struct.
	(get_amd_cpu): Check for family 15h processors.
	(cpu_indicator_init): Adjust model and family for AMD processors.
	Refactor code.
 
	* i386.c (IX86_BUILTIN_CPU_IS_AMDFAM15): New enum value.
	(fold_builtin_cpu): Process IX86_BUILTIN_CPU_IS_AMDFAM15.
	(ix86_init_platform_type_builtins): Make new builtin _builtin_cpu_is_amdfam15.
	(ix86_expand_builtin): Expand IX86_BUILTIN_CPU_IS_AMDFAM15.
	* testsuite/gcc.target/builtin_target.c (fn1): Call __builtin_cpu_is_amdfam15.

Index: libgcc/config/i386/i386-cpuinfo.c
===================================================================
--- libgcc/config/i386/i386-cpuinfo.c	(revision 183073)
+++ libgcc/config/i386/i386-cpuinfo.c	(working copy)
@@ -63,6 +63,7 @@ struct __processor_model
   unsigned int __cpu_is_amdfam10_barcelona : 1;
   unsigned int __cpu_is_amdfam10_shanghai : 1;
   unsigned int __cpu_is_amdfam10_istanbul : 1;
+  unsigned int __cpu_is_amdfam15 : 1;
 } __cpu_model;
 
 /* Get the specific type of AMD CPU.  */
@@ -72,18 +73,22 @@ get_amd_cpu (unsigned int family, unsigned int mod
 {
   switch (family)
     {
+    /* AMD Family 10h.  */
     case 0x10:
       switch (model)
 	{
 	case 0x2:
+	  /* Barcelona.  */
 	  __cpu_model.__cpu_is_amdfam10 = 1;
 	  __cpu_model.__cpu_is_amdfam10_barcelona = 1;
 	  break;
 	case 0x4:
+	  /* Shanghai.  */
 	  __cpu_model.__cpu_is_amdfam10 = 1;
 	  __cpu_model.__cpu_is_amdfam10_shanghai = 1;
 	  break;
 	case 0x8:
+	  /* Istanbul.  */
 	  __cpu_model.__cpu_is_amdfam10 = 1;
 	  __cpu_model.__cpu_is_amdfam10_istanbul = 1;
 	  break;
@@ -91,6 +96,10 @@ get_amd_cpu (unsigned int family, unsigned int mod
 	  break;
 	}
       break;
+    /* AMD Family 15h.  */
+    case 0x15:
+      __cpu_model.__cpu_is_amdfam15 = 1;
+      break;
     default:
       break;
     }
@@ -223,6 +232,7 @@ __cpu_indicator_init (void)
   int max_level = 5;
   unsigned int vendor;
   unsigned int model, family, brand_id;
+  unsigned int extended_model, extended_family;
   static int called = 0;
 
   /* This function needs to run just once.  */
@@ -247,14 +257,12 @@ __cpu_indicator_init (void)
   model = (eax >> 4) & 0x0f;
   family = (eax >> 8) & 0x0f;
   brand_id = ebx & 0xff;
+  extended_model = (eax >> 12) & 0xf0;
+  extended_family = (eax >> 20) & 0xff;
 
-  /* Adjust model and family for Intel CPUS. */
   if (vendor == SIG_INTEL)
     {
-      unsigned int extended_model, extended_family;
-
-      extended_model = (eax >> 12) & 0xf0;
-      extended_family = (eax >> 20) & 0xff;
+      /* Adjust model and family for Intel CPUS. */
       if (family == 0x0f)
 	{
 	  family += extended_family;
@@ -262,20 +270,25 @@ __cpu_indicator_init (void)
 	}
       else if (family == 0x06)
 	model += extended_model;
+
+      /* Get CPU type.  */
+      __cpu_model.__cpu_is_intel = 1;
+      get_intel_cpu (family, model, brand_id);
     }
 
-  /* Find CPU model. */
-
   if (vendor == SIG_AMD)
     {
+      /* Adjust model and family for AMD CPUS. */
+      if (family == 0x0f)
+	{
+	  family += extended_family;
+	  model += (extended_model << 4);
+	}
+
+      /* Get CPU type.  */
       __cpu_model.__cpu_is_amd = 1;
       get_amd_cpu (family, model);
     }
-  else if (vendor == SIG_INTEL)
-    {
-      __cpu_model.__cpu_is_intel = 1;
-      get_intel_cpu (family, model, brand_id);
-    }
 
   /* Find available features. */
   get_available_features (ecx, edx);
Index: gcc/testsuite/gcc.target/i386/builtin_target.c
===================================================================
--- gcc/testsuite/gcc.target/i386/builtin_target.c	(revision 183073)
+++ gcc/testsuite/gcc.target/i386/builtin_target.c	(working copy)
@@ -47,6 +47,8 @@ fn1 ()
     return -1;
   if (__builtin_cpu_is_amdfam10_istanbul () < 0)
     return -1;
+  if (__builtin_cpu_is_amdfam15 () < 0)
+    return -1;
 
   return 0;
 }
Index: gcc/config/i386/i386.c
===================================================================
--- gcc/config/i386/i386.c	(revision 183073)
+++ gcc/config/i386/i386.c	(working copy)
@@ -24545,6 +24545,7 @@ enum ix86_builtins
   IX86_BUILTIN_CPU_IS_AMDFAM10_BARCELONA,
   IX86_BUILTIN_CPU_IS_AMDFAM10_SHANGHAI,
   IX86_BUILTIN_CPU_IS_AMDFAM10_ISTANBUL,
+  IX86_BUILTIN_CPU_IS_AMDFAM15,
 
   IX86_BUILTIN_MAX
 };
@@ -26028,6 +26029,7 @@ fold_builtin_cpu (enum ix86_builtins fn_code)
     M_AMDFAM10_BARCELONA,
     M_AMDFAM10_SHANGHAI,
     M_AMDFAM10_ISTANBUL,
+    M_AMDFAM15,
     M_MAX
   };
 
@@ -26149,6 +26151,11 @@ fold_builtin_cpu (enum ix86_builtins fn_code)
 				     M_AMDFAM10_ISTANBUL);
       which_struct = __cpu_model_var;
       break;
+    case IX86_BUILTIN_CPU_IS_AMDFAM15:
+      field = get_field_from_struct (__processor_model_type,
+				     M_AMDFAM15);
+      which_struct = __cpu_model_var;
+      break;
     default:
       return NULL_TREE;
     }
@@ -26721,6 +26728,8 @@ ix86_init_platform_type_builtins (void)
 			 IX86_BUILTIN_CPU_IS_AMDFAM10_SHANGHAI, 1);
   make_platform_builtin ("__builtin_cpu_is_amdfam10_istanbul",
 			 IX86_BUILTIN_CPU_IS_AMDFAM10_ISTANBUL, 1);
+  make_platform_builtin ("__builtin_cpu_is_amdfam15",
+			 IX86_BUILTIN_CPU_IS_AMDFAM15, 1);
 }
 
 /* Detect if this unaligned vectorizable load/stores should be
@@ -28307,6 +28316,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx sub
     case IX86_BUILTIN_CPU_IS_AMDFAM10_BARCELONA:
     case IX86_BUILTIN_CPU_IS_AMDFAM10_SHANGHAI:
     case IX86_BUILTIN_CPU_IS_AMDFAM10_ISTANBUL:
+    case IX86_BUILTIN_CPU_IS_AMDFAM15:
       {
         tree fold_expr = fold_builtin_cpu ((enum ix86_builtins) fcode);
 	gcc_assert (fold_expr != NULL_TREE);

--
This patch is available for review at http://codereview.appspot.com/5535046

Diego Novillo

On 12-01-10 17:11 , Sriraman Tallam wrote: > This patch adds a new target builtin, ...

12 years, 3 months ago (2012-01-10 23:31:45 UTC) #2

pinskia_gmail.com

On Tue, Jan 10, 2012 at 3:31 PM, Diego Novillo <dnovillo@google.com> wrote: > On 12-01-10 ...

12 years, 3 months ago (2012-01-10 23:33:18 UTC) #3

Diego Novillo

On 12-01-10 18:33 , Andrew Pinski wrote: > On Tue, Jan 10, 2012 at 3:31 ...

12 years, 3 months ago (2012-01-10 23:34:49 UTC) #4

Sriraman

On Tue, Jan 10, 2012 at 3:33 PM, Andrew Pinski <pinskia@gmail.com> wrote: > On Tue, ...

12 years, 3 months ago (2012-01-10 23:39:14 UTC) #5

davidxl

http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c File gcc/config/i386/i386.c (right): http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c#newcode26032 gcc/config/i386/i386.c:26032: + M_AMDFAM15, Maybe better to change 10 to 10H, ...

12 years, 3 months ago (2012-01-11 00:05:01 UTC) #6

Sriraman

New patch uploaded with the changes. * i386.c (IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER1): New enum value. (IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER2): New enum ...

12 years, 3 months ago (2012-01-11 20:06:14 UTC) #7

New patch uploaded with the changes.


	* i386.c (IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER1): New enum value.
	(IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER2): New enum value.
	(IX86_BUILTIN_CPU_IS_AMDFAM10H): Rename IX86_BUILTIN_CPU_IS_AMDFAM10.
	(IX86_BUILTIN_CPU_IS_AMDFAM10H_BARCELONA): Rename
IX86_BUILTIN_CPU_IS_AMDFAM10_BARCELONA.
	(IX86_BUILTIN_CPU_IS_AMDFAM10H_SHANGHAI): Rename
IX86_BUILTIN_CPU_IS_AMDFAM10_SHANGHAI.
	(IX86_BUILTIN_CPU_IS_AMDFAM10H_ISTANBUL): Rename
IX86_BUILTIN_CPU_IS_AMDFAM10_ISTANBUL.
	(fold_builtin_cpu): Process IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER1
	and IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER2.
	(M_AMDFAM10H): Rename M_AMDFAM10.
	(M_AMDFAM10H_BARCELONA): Rename M_AMDFAM10_BARCELONA.
	(M_AMDFAM10H_SHANGHAI): Rename M_AMDFAM10_SHANGHAI.
	(M_AMDFAM10H_ISTANBUL): Rename M_AMDFAM10_ISTANBUL.
	(ix86_init_platform_type_builtins): Make new builtins
__builtin_cpu_is_amdfam15_bdver1
	and __builtin_cpu_is_amdfam15_bdver2.
	(ix86_expand_builtin): Expand IX86_BUILTIN_CPU_IS_AMDFAM15_BDVER1 and 
	IX86_BUILTIN_CPU_IS_AMDFAM15_BDVER2.
	* testsuite/gcc.target/builtin_target.c (fn1): Call new builtins.

	* i386-cpuinfo.c (__cpu_is_amdfam15h_bdver1): New member in __cpu_model struct.
	(__cpu_is_amdfam15h_bdver2): New member in __cpu_model struct.
	(__cpu_model): Rename __cpu_is_amdfam10 to __cpu_is_amdfam10h.
	Rename __cpu_is_amdfam10_barcelona to __cpu_is_amdfam10h_barcelona.
	Rename __cpu_is_amdfam10_shanghai to __cpu_is_amdfam10h_shanghai.
	Rename __cpu_is_amdfam10_istanbul to __cpu_is_amdfam10h_istanbul.
	(get_amd_cpu): Check for family 15h processors.
	(cpu_indicator_init): Adjust model and family for AMD processors.
	Refactor code.


Thanks,
-Sri.

On 2012/01/11 00:05:01, davidxl wrote:
> http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c
> File gcc/config/i386/i386.c (right):
> 
>
http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c#newcode26032
> gcc/config/i386/i386.c:26032: +    M_AMDFAM15,
> Maybe better to change 10 to 10H, and 15 to 15H in the name as the number is
> hex.
> 
> Why not split the enum for family 15h into M_AMDFAM15H_BDVER1 and .._BVER2?
> 
> http://codereview.appspot.com/5535046/diff/1/libgcc/config/i386/i386-cpuinfo.c
> File libgcc/config/i386/i386-cpuinfo.c (right):
> 
>
http://codereview.appspot.com/5535046/diff/1/libgcc/config/i386/i386-cpuinfo....
> libgcc/config/i386/i386-cpuinfo.c:102: break;
> No family15h model encoding?

davidxl

Good for google branches. Please re-submit the combined runtime support patch to trunk for review. ...

12 years, 3 months ago (2012-01-11 23:51:16 UTC) #8

Good for google branches.

Please re-submit the combined runtime support patch to trunk for review.

thanks,

David

On Wed, Jan 11, 2012 at 12:06 PM,  <tmsriram@google.com> wrote:
> New patch uploaded with the changes.
>
>
>        * i386.c (IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER1): New enum value.
>        (IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER2): New enum value.
>        (IX86_BUILTIN_CPU_IS_AMDFAM10H): Rename IX86_BUILTIN_CPU_IS_AMDFAM10.
>        (IX86_BUILTIN_CPU_IS_AMDFAM10H_BARCELONA): Rename
> IX86_BUILTIN_CPU_IS_AMDFAM10_BARCELONA.
>        (IX86_BUILTIN_CPU_IS_AMDFAM10H_SHANGHAI): Rename
> IX86_BUILTIN_CPU_IS_AMDFAM10_SHANGHAI.
>        (IX86_BUILTIN_CPU_IS_AMDFAM10H_ISTANBUL): Rename
> IX86_BUILTIN_CPU_IS_AMDFAM10_ISTANBUL.
>        (fold_builtin_cpu): Process IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER1
>        and IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER2.
>        (M_AMDFAM10H): Rename M_AMDFAM10.
>        (M_AMDFAM10H_BARCELONA): Rename M_AMDFAM10_BARCELONA.
>        (M_AMDFAM10H_SHANGHAI): Rename M_AMDFAM10_SHANGHAI.
>        (M_AMDFAM10H_ISTANBUL): Rename M_AMDFAM10_ISTANBUL.
>        (ix86_init_platform_type_builtins): Make new builtins
> __builtin_cpu_is_amdfam15_bdver1
>        and __builtin_cpu_is_amdfam15_bdver2.
>        (ix86_expand_builtin): Expand IX86_BUILTIN_CPU_IS_AMDFAM15_BDVER1 and
>        IX86_BUILTIN_CPU_IS_AMDFAM15_BDVER2.
>        * testsuite/gcc.target/builtin_target.c (fn1): Call new builtins.
>
>        * i386-cpuinfo.c (__cpu_is_amdfam15h_bdver1): New member in
> __cpu_model
> struct.
>        (__cpu_is_amdfam15h_bdver2): New member in __cpu_model struct.
>        (__cpu_model): Rename __cpu_is_amdfam10 to __cpu_is_amdfam10h.
>        Rename __cpu_is_amdfam10_barcelona to __cpu_is_amdfam10h_barcelona.
>        Rename __cpu_is_amdfam10_shanghai to __cpu_is_amdfam10h_shanghai.
>        Rename __cpu_is_amdfam10_istanbul to __cpu_is_amdfam10h_istanbul.
>
>        (get_amd_cpu): Check for family 15h processors.
>        (cpu_indicator_init): Adjust model and family for AMD processors.
>        Refactor code.
>
>
> Thanks,
> -Sri.
>
>
> On 2012/01/11 00:05:01, davidxl wrote:
>>
>> http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c
>> File gcc/config/i386/i386.c (right):
>
>
>
>
http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c#newcode26032
>>
>> gcc/config/i386/i386.c:26032: +    M_AMDFAM15,
>> Maybe better to change 10 to 10H, and 15 to 15H in the name as the
>
> number is
>>
>> hex.
>
>
>> Why not split the enum for family 15h into M_AMDFAM15H_BDVER1 and
>
> .._BVER2?
>
>
> http://codereview.appspot.com/5535046/diff/1/libgcc/config/i386/i386-cpuinfo.c
>>
>> File libgcc/config/i386/i386-cpuinfo.c (right):
>
>
>
>
http://codereview.appspot.com/5535046/diff/1/libgcc/config/i386/i386-cpuinfo....
>>
>> libgcc/config/i386/i386-cpuinfo.c:102: break;
>> No family15h model encoding?
>
>
>
>
> http://codereview.appspot.com/5535046/

Sriraman

12 years, 3 months ago (2012-01-12 00:18:50 UTC) #9

Submitted to google 4.6 branch.

On Wed, Jan 11, 2012 at 3:51 PM, Xinliang David Li <davidxl@google.com> wrote:
> Good for google branches.
>
> Please re-submit the combined runtime support patch to trunk for review.

Will do.

Thanks,
-Sri.

>
> thanks,
>
> David
>
> On Wed, Jan 11, 2012 at 12:06 PM,  <tmsriram@google.com> wrote:
>> New patch uploaded with the changes.
>>
>>
>>        * i386.c (IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER1): New enum value.
>>        (IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER2): New enum value.
>>        (IX86_BUILTIN_CPU_IS_AMDFAM10H): Rename IX86_BUILTIN_CPU_IS_AMDFAM10.
>>        (IX86_BUILTIN_CPU_IS_AMDFAM10H_BARCELONA): Rename
>> IX86_BUILTIN_CPU_IS_AMDFAM10_BARCELONA.
>>        (IX86_BUILTIN_CPU_IS_AMDFAM10H_SHANGHAI): Rename
>> IX86_BUILTIN_CPU_IS_AMDFAM10_SHANGHAI.
>>        (IX86_BUILTIN_CPU_IS_AMDFAM10H_ISTANBUL): Rename
>> IX86_BUILTIN_CPU_IS_AMDFAM10_ISTANBUL.
>>        (fold_builtin_cpu): Process IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER1
>>        and IX86_BUILTIN_CPU_IS_AMDFAM15H_BDVER2.
>>        (M_AMDFAM10H): Rename M_AMDFAM10.
>>        (M_AMDFAM10H_BARCELONA): Rename M_AMDFAM10_BARCELONA.
>>        (M_AMDFAM10H_SHANGHAI): Rename M_AMDFAM10_SHANGHAI.
>>        (M_AMDFAM10H_ISTANBUL): Rename M_AMDFAM10_ISTANBUL.
>>        (ix86_init_platform_type_builtins): Make new builtins
>> __builtin_cpu_is_amdfam15_bdver1
>>        and __builtin_cpu_is_amdfam15_bdver2.
>>        (ix86_expand_builtin): Expand IX86_BUILTIN_CPU_IS_AMDFAM15_BDVER1 and
>>        IX86_BUILTIN_CPU_IS_AMDFAM15_BDVER2.
>>        * testsuite/gcc.target/builtin_target.c (fn1): Call new builtins.
>>
>>        * i386-cpuinfo.c (__cpu_is_amdfam15h_bdver1): New member in
>> __cpu_model
>> struct.
>>        (__cpu_is_amdfam15h_bdver2): New member in __cpu_model struct.
>>        (__cpu_model): Rename __cpu_is_amdfam10 to __cpu_is_amdfam10h.
>>        Rename __cpu_is_amdfam10_barcelona to __cpu_is_amdfam10h_barcelona.
>>        Rename __cpu_is_amdfam10_shanghai to __cpu_is_amdfam10h_shanghai.
>>        Rename __cpu_is_amdfam10_istanbul to __cpu_is_amdfam10h_istanbul.
>>
>>        (get_amd_cpu): Check for family 15h processors.
>>        (cpu_indicator_init): Adjust model and family for AMD processors.
>>        Refactor code.
>>
>>
>> Thanks,
>> -Sri.
>>
>>
>> On 2012/01/11 00:05:01, davidxl wrote:
>>>
>>> http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c
>>> File gcc/config/i386/i386.c (right):
>>
>>
>>
>>
http://codereview.appspot.com/5535046/diff/1/gcc/config/i386/i386.c#newcode26032
>>>
>>> gcc/config/i386/i386.c:26032: +    M_AMDFAM15,
>>> Maybe better to change 10 to 10H, and 15 to 15H in the name as the
>>
>> number is
>>>
>>> hex.
>>
>>
>>> Why not split the enum for family 15h into M_AMDFAM15H_BDVER1 and
>>
>> .._BVER2?
>>
>>
>>
http://codereview.appspot.com/5535046/diff/1/libgcc/config/i386/i386-cpuinfo.c
>>>
>>> File libgcc/config/i386/i386-cpuinfo.c (right):
>>
>>
>>
>>
http://codereview.appspot.com/5535046/diff/1/libgcc/config/i386/i386-cpuinfo....
>>>
>>> libgcc/config/i386/i386-cpuinfo.c:102: break;
>>> No family15h model encoding?
>>
>>
>>
>>
>> http://codereview.appspot.com/5535046/

Expand All Messages | Collapse All Messages