Skip to content

Revert "[X86] Use generic CPU tuning when tune-cpu is empty" #93436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2024

Conversation

phoebewang
Copy link
Contributor

Reverts #83631

Using HasX86_64 is incorrect.

@phoebewang phoebewang merged commit cbd8031 into main May 27, 2024
4 of 6 checks passed
@phoebewang phoebewang deleted the revert-83631-tuning branch May 27, 2024 03:35
@llvmbot
Copy link
Member

llvmbot commented May 27, 2024

@llvm/pr-subscribers-backend-x86

Author: Phoebe Wang (phoebewang)

Changes

Reverts llvm/llvm-project#83631

Using HasX86_64 is incorrect.


Full diff: https://github.com/llvm/llvm-project/pull/93436.diff

1 Files Affected:

  • (modified) llvm/lib/Target/X86/X86Subtarget.cpp (+1-1)
diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp
index bac8d3a29ec06..c2e6ddd7e7fa2 100644
--- a/llvm/lib/Target/X86/X86Subtarget.cpp
+++ b/llvm/lib/Target/X86/X86Subtarget.cpp
@@ -252,7 +252,7 @@ void X86Subtarget::initSubtargetFeatures(StringRef CPU, StringRef TuneCPU,
     CPU = "generic";
 
   if (TuneCPU.empty())
-    TuneCPU = HasX86_64 ? "generic" : "i586";
+    TuneCPU = "i586"; // FIXME: "generic" is more modern than llc tests expect.
 
   std::string FullFS = X86_MC::ParseX86Triple(TargetTriple);
   assert(!FullFS.empty() && "Failed to parse X86 triple");

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants