Two changes:

1. Default to having V9 instructions, instead of just V8.
2. unless -enable-sparc-v9-insts is passed, disable V9 (for use with llcbeta)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25807 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/Sparc/SparcSubtarget.cpp b/lib/Target/Sparc/SparcSubtarget.cpp
index 9666ea9d4543d7a5a49d850a29741cd8b19a2b23..46ea7d4284813c343dec60f98590222a8b13654b 100644 (file)
--- a/lib/Target/Sparc/SparcSubtarget.cpp
+++ b/lib/Target/Sparc/SparcSubtarget.cpp
@@ -15,6 +15,13 @@
 #include "SparcV8GenSubtarget.inc"
 using namespace llvm;
 
+// FIXME: temporary.
+#include "llvm/Support/CommandLine.h"
+namespace {
+  cl::opt<bool> EnableV9("enable-sparc-v9-insts", cl::Hidden,
+                          cl::desc("Enable V9 instructions in the V8 target"));
+}
+
 SparcV8Subtarget::SparcV8Subtarget(const Module &M, const std::string &FS) {
   // Set the default features.
   IsV9 = false;
@@ -25,8 +32,12 @@ SparcV8Subtarget::SparcV8Subtarget(const Module &M, const std::string &FS) {
   std::string CPU = "generic";
 
   // FIXME: autodetect host here!
+  CPU = "v9";   // What is a good way to detect V9?
   
   // Parse features string.
   ParseSubtargetFeatures(FS, CPU);
 
+  // Unless explicitly enabled, disable the V9 instructions.
+  if (!EnableV9)
+    IsV9 = false;
 };

diff --git a/lib/Target/SparcV8/SparcV8Subtarget.cpp b/lib/Target/SparcV8/SparcV8Subtarget.cpp
index 9666ea9d4543d7a5a49d850a29741cd8b19a2b23..46ea7d4284813c343dec60f98590222a8b13654b 100644 (file)
--- a/lib/Target/SparcV8/SparcV8Subtarget.cpp
+++ b/lib/Target/SparcV8/SparcV8Subtarget.cpp
@@ -15,6 +15,13 @@
 #include "SparcV8GenSubtarget.inc"
 using namespace llvm;
 
+// FIXME: temporary.
+#include "llvm/Support/CommandLine.h"
+namespace {
+  cl::opt<bool> EnableV9("enable-sparc-v9-insts", cl::Hidden,
+                          cl::desc("Enable V9 instructions in the V8 target"));
+}
+
 SparcV8Subtarget::SparcV8Subtarget(const Module &M, const std::string &FS) {
   // Set the default features.
   IsV9 = false;
@@ -25,8 +32,12 @@ SparcV8Subtarget::SparcV8Subtarget(const Module &M, const std::string &FS) {
   std::string CPU = "generic";
 
   // FIXME: autodetect host here!
+  CPU = "v9";   // What is a good way to detect V9?
   
   // Parse features string.
   ParseSubtargetFeatures(FS, CPU);
 
+  // Unless explicitly enabled, disable the V9 instructions.
+  if (!EnableV9)
+    IsV9 = false;
 };