[llvm-branch-commits] [llvm-branch] r103452 - in /llvm/branches/Apple/Morbo: ./ include/llvm/Target/SubtargetFeature.h lib/Target/SubtargetFeature.cpp tools/lto/LTOCodeGenerator.cpp tools/lto/LTOModule.cpp

Bill Wendling isanbard at gmail.com
Mon May 10 17:31:21 PDT 2010


Author: void
Date: Mon May 10 19:31:21 2010
New Revision: 103452

URL: http://llvm.org/viewvc/llvm-project?rev=103452&view=rev
Log:
$ svn merge -c 103451 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r103451 into '.':
U    include/llvm/Target/SubtargetFeature.h
U    tools/lto/LTOCodeGenerator.cpp
U    tools/lto/LTOModule.cpp
U    lib/Target/SubtargetFeature.cpp


Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/include/llvm/Target/SubtargetFeature.h
    llvm/branches/Apple/Morbo/lib/Target/SubtargetFeature.cpp
    llvm/branches/Apple/Morbo/tools/lto/LTOCodeGenerator.cpp
    llvm/branches/Apple/Morbo/tools/lto/LTOModule.cpp

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 10 19:31:21 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988-99989,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,10074
 2,100751,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,102120,102225,102358,102394,102405,102421,102454,102463,102468,102470,102481,102486,102504-102505,102508-102510,102513,102519,102524,102526,102531,102558,102646,102653,102655,102661-102662,102672,102743,102760,102770,102791,102948,102970,102980,103001,103133,103233,103314,103356,103415
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988-99989,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,10074
 2,100751,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,102120,102225,102358,102394,102405,102421,102454,102463,102468,102470,102481,102486,102504-102505,102508-102510,102513,102519,102524,102526,102531,102558,102646,102653,102655,102661-102662,102672,102743,102760,102770,102791,102948,102970,102980,103001,103133,103233,103314,103356,103415,103451

Modified: llvm/branches/Apple/Morbo/include/llvm/Target/SubtargetFeature.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/include/llvm/Target/SubtargetFeature.h?rev=103452&r1=103451&r2=103452&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/include/llvm/Target/SubtargetFeature.h (original)
+++ llvm/branches/Apple/Morbo/include/llvm/Target/SubtargetFeature.h Mon May 10 19:31:21 2010
@@ -108,9 +108,10 @@
   // Dump feature info.
   void dump() const;
 
-  /// Retrieve a formatted string of the default features for
-  /// the specified target triple.
-  static std::string getDefaultSubtargetFeatures(const Triple &Triple);
+  /// Retrieve a formatted string of the default features for the specified
+  /// target triple.
+  void getDefaultSubtargetFeatures(const std::string &CPU,
+                                   const Triple& Triple);
 };
 
 } // End namespace llvm

Modified: llvm/branches/Apple/Morbo/lib/Target/SubtargetFeature.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/SubtargetFeature.cpp?rev=103452&r1=103451&r2=103452&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/SubtargetFeature.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Target/SubtargetFeature.cpp Mon May 10 19:31:21 2010
@@ -359,29 +359,41 @@
   print(dbgs());
 }
 
-/// getDefaultSubtargetFeatures - Return a string listing
-/// the features associated with the target triple.
+/// getDefaultSubtargetFeatures - Return a string listing the features
+/// associated with the target triple.
 ///
 /// FIXME: This is an inelegant way of specifying the features of a
 /// subtarget. It would be better if we could encode this information
 /// into the IR. See <rdar://5972456>.
 ///
-std::string SubtargetFeatures::getDefaultSubtargetFeatures(
-                                               const Triple& Triple) {
+void SubtargetFeatures::getDefaultSubtargetFeatures(const std::string &CPU,
+                                                    const Triple& Triple) {
+  setCPU(CPU);
+
+  const char *Attrs = 0;
+
   switch (Triple.getVendor()) {
   case Triple::Apple:
     switch (Triple.getArch()) {
     case Triple::ppc:   // powerpc-apple-*
-      return std::string("altivec");
+      Attrs = "altivec";
+      break;
     case Triple::ppc64: // powerpc64-apple-*
-      return std::string("64bit,altivec");
+      Attrs = "64bit,altivec";
+      break;
     default:
       break;
     }
     break;
   default:
     break;
-  } 
+  }
+
+  StringRef SR(Attrs);
 
-  return std::string("");
+  while (!SR.empty()) {
+    std::pair<StringRef, StringRef> Res = SR.split(',');
+    AddFeature(Res.first);
+    SR = Res.second;
+  }
 }

Modified: llvm/branches/Apple/Morbo/tools/lto/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/tools/lto/LTOCodeGenerator.cpp?rev=103452&r1=103451&r2=103452&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/tools/lto/LTOCodeGenerator.cpp (original)
+++ llvm/branches/Apple/Morbo/tools/lto/LTOCodeGenerator.cpp Mon May 10 19:31:21 2010
@@ -304,8 +304,9 @@
         }
 
         // construct LTModule, hand over ownership of module and target
-        const std::string FeatureStr =
-           SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple));
+        SubtargetFeatures Features;
+        Features.getDefaultSubtargetFeatures("" /* cpu */, llvm::Triple(Triple));
+        std::string FeatureStr = Features.getString();
         _target = march->createTargetMachine(Triple, FeatureStr);
     }
     return false;

Modified: llvm/branches/Apple/Morbo/tools/lto/LTOModule.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/tools/lto/LTOModule.cpp?rev=103452&r1=103451&r2=103452&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/tools/lto/LTOModule.cpp (original)
+++ llvm/branches/Apple/Morbo/tools/lto/LTOModule.cpp Mon May 10 19:31:21 2010
@@ -140,8 +140,9 @@
         return NULL;
 
     // construct LTModule, hand over ownership of module and target
-    const std::string FeatureStr = 
-        SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple));
+    SubtargetFeatures Features;
+    Features.getDefaultSubtargetFeatures("" /* cpu */, llvm::Triple(Triple));
+    std::string FeatureStr = Features.getString();
     TargetMachine* target = march->createTargetMachine(Triple, FeatureStr);
     return new LTOModule(m.take(), target);
 }





More information about the llvm-branch-commits mailing list