24960500 llvm getHostCPUName() comes up with names that its parser doesn't recognize
authorJay Cotton <Jay.Cotton@Oracle.com>
Mon, 13 Feb 2017 11:35:38 -0800
changeset 7665 a7b902bdb03a
parent 7662 e9ad40e73ba5
child 7666 cf60591fb76a
24960500 llvm getHostCPUName() comes up with names that its parser doesn't recognize 25519458 LLVM getHostCPUName will not work with Fujitsu processor names
components/llvm/patches/002-solaris-LLVM-libLLVMSupport.patch
components/llvm/patches/032-solaris-LLVM-libTarget-SPARC.patch
--- a/components/llvm/patches/002-solaris-LLVM-libLLVMSupport.patch	Fri Feb 10 14:09:01 2017 -0800
+++ b/components/llvm/patches/002-solaris-LLVM-libLLVMSupport.patch	Mon Feb 13 11:35:38 2017 -0800
@@ -4990,7 +4990,7 @@
  #define DEBUG_TYPE "host-detection"
  
  //===----------------------------------------------------------------------===//
[email protected]@ -733,6 +738,42 @@
[email protected]@ -733,6 +738,30 @@
    
    return "generic";
  }
@@ -5010,19 +5010,7 @@
 +      kstat_read(KC, KSP, NULL);
 +      KNP = reinterpret_cast<kstat_named_t*>(kstat_data_lookup(KSP, "brand"));
 +      Value = (const char *) KNP->value.str.addr.ptr;
-+      (void) std::sprintf(Buffer, "%s (", Value);
-+
-+      KNP =
-+        reinterpret_cast<kstat_named_t*>(kstat_data_lookup(KSP, "cpu_type"));
-+      Value = (const char*) KNP->value.c;
-+      (void) std::strcat(Buffer, Value);
-+      (void) std::strcat(Buffer, ") ");
-+
-+      KNP =
-+        reinterpret_cast<kstat_named_t*>(kstat_data_lookup(KSP,
-+                                                           "implementation"));
-+      Value = (const char*) KNP->value.str.addr.ptr;
-+      (void) std::strcat(Buffer, Value);
++      (void) strlcpy(Buffer, Value, sizeof(Buffer));
 +      Init = true;
 +      kstat_close(KC);
 +    }
--- a/components/llvm/patches/032-solaris-LLVM-libTarget-SPARC.patch	Fri Feb 10 14:09:01 2017 -0800
+++ b/components/llvm/patches/032-solaris-LLVM-libTarget-SPARC.patch	Mon Feb 13 11:35:38 2017 -0800
@@ -1,11 +1,13 @@
+# 25519458 LLVM getHostCPUName will not work with Fujitsu processor names
+# 24960500 llvm getHostCPUName() comes up with names that its parser doesn't recognize
 # 22777179 implement -mtune= | -march= | -mcpu= in clang SPARC
 # 22778085 LLVM is using %icc when it should be using %xcc
 # 22778089 the SPARCV9 IS implementation is incomplete
 # 22778098 LLVM should emit proc identifiers in SPARC assembler (capabilities)
 # 3.9.X for upstream.
---- lib/Target/Sparc/Sparc.td	2015-03-27 20:03:51.000000000 -0800
-+++ lib/Target/Sparc/Sparc.td	2016-06-30 08:30:11.896274715 -0800
[email protected]@ -35,13 +35,15 @@
+--- lib/Target/Sparc/Sparc.td	2015-03-27 21:03:51.000000000 -0700
++++ lib/Target/Sparc/Sparc.td	2017-02-08 09:22:42.929246156 -0800
[email protected]@ -35,14 +35,16 @@
  def FeatureVIS3
    : SubtargetFeature<"vis3", "IsVIS3", "true",
                       "Enable Visual Instruction Set extensions III">;
@@ -13,9 +15,6 @@
  def FeatureHardQuad
    : SubtargetFeature<"hard-quad-float", "HasHardQuad", "true",
                       "Enable quad-word floating point instructions">;
--
--def UsePopc : SubtargetFeature<"popc", "UsePopc", "true",
--                               "Use the popc (population count) instruction">;
 +def UsePopc
 +  : SubtargetFeature<"popc", "UsePopc", "true",
 +                     "Use the popc (population count) instruction">;
@@ -23,8 +22,12 @@
 +  : SubtargetFeature<"hwcap", "UseHWCap", "true",
 +                      "Use SPARC Hardware Capabiliies">;
  
+-def UsePopc : SubtargetFeature<"popc", "UsePopc", "true",
+-                               "Use the popc (population count) instruction">;
+-
  //===----------------------------------------------------------------------===//
  // Register File, Calling Conv, Instruction Descriptions
+ //===----------------------------------------------------------------------===//
 @@ -74,10 +76,46 @@
  def : Proc<"sparclite86x",    []>;
  def : Proc<"sparclet",        []>;
@@ -74,18 +77,40 @@
  def : Proc<"niagara",         [FeatureV9, FeatureV8Deprecated, FeatureVIS,
                                 FeatureVIS2]>;
  def : Proc<"niagara2",        [FeatureV9, FeatureV8Deprecated, UsePopc,
[email protected]@ -86,7 +124,10 @@
[email protected]@ -86,8 +124,31 @@
                                 FeatureVIS, FeatureVIS2]>;
  def : Proc<"niagara4",        [FeatureV9, FeatureV8Deprecated, UsePopc,
                                 FeatureVIS, FeatureVIS2, FeatureVIS3]>;
--
 +def : Proc<"sparc4",          [FeatureV9, FeatureV8Deprecated, UsePopc,
 +                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
 +def : Proc<"sparc5",          [FeatureV9, FeatureV8Deprecated, UsePopc,
 +                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC-T4",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC-T5",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC-M5",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC-M6",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC-T7",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC-S7",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC-M8",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC64-X",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC64-X+",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
++def : Proc<"SPARC64-XII",        [FeatureV9, FeatureV8Deprecated, UsePopc,
++                               FeatureVIS, FeatureVIS2, FeatureVIS3]>;
  
+-
  //===----------------------------------------------------------------------===//
  // Declare the target which we are implementing
+ //===----------------------------------------------------------------------===//
+
 ###
 --- lib/Target/Sparc/SparcRegisterInfo.td	2015-10-04 01:11:22.000000000 -0800
 +++ lib/Target/Sparc/SparcRegisterInfo.td	2016-06-29 17:37:09.214126550 -0800