diff --git a/llvm/include/llvm/Support/Host.h b/llvm/include/llvm/Support/Host.h
--- a/llvm/include/llvm/Support/Host.h
+++ b/llvm/include/llvm/Support/Host.h
@@ -65,6 +65,21 @@
   StringRef getHostCPUNameForARM(StringRef ProcCpuinfoContent);
   StringRef getHostCPUNameForS390x(StringRef ProcCpuinfoContent);
   StringRef getHostCPUNameForBPF();
+
+  /// Helper functions to extract CPU details from CPUID on x86.
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) ||            \
+    defined(_M_X64)
+  namespace x86 {
+  enum VendorSignatures {
+    SIG_INTEL = 0x756e6547 /* Genu */,
+    SIG_AMD = 0x68747541 /* Auth */,
+    UNKNOWN = 0
+  };
+
+  /// Returns the host CPU's vendor.
+  VendorSignatures getVendorSignature();
+  } // namespace x86
+#endif
   }
 }
 }
diff --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp
--- a/llvm/lib/Support/Host.cpp
+++ b/llvm/lib/Support/Host.cpp
@@ -420,11 +420,6 @@
 #if defined(__i386__) || defined(_M_IX86) || \
     defined(__x86_64__) || defined(_M_X64)
 
-enum VendorSignatures {
-  SIG_INTEL = 0x756e6547 /* Genu */,
-  SIG_AMD = 0x68747541 /* Auth */
-};
-
 // The check below for i386 was copied from clang's cpuid.h (__get_cpuid_max).
 // Check motivated by bug reports for OpenSSL crashing on CPUs without CPUID
 // support. Consequently, for i386, the presence of CPUID is checked first
@@ -498,6 +493,31 @@
 #endif
 }
 
+namespace llvm {
+namespace sys {
+namespace detail {
+namespace x86 {
+
+VendorSignatures getVendorSignature() {
+  unsigned __attribute__((unused)) EAX = 0, EBX = 0, ECX = 0, EDX = 0;
+  unsigned MaxLeaf, Vendor;
+
+  if (!isCpuIdSupported())
+    return UNKNOWN;
+
+  if (getX86CpuIDAndInfo(0, &MaxLeaf, &Vendor, &ECX, &EDX) || MaxLeaf < 1)
+    return UNKNOWN;
+
+  return static_cast<VendorSignatures>(Vendor);
+}
+
+} // namespace x86
+} // namespace detail
+} // namespace sys
+} // namespace llvm
+using namespace llvm::sys::detail::x86;
+using llvm::sys::detail::x86::VendorSignatures;
+
 /// getX86CpuIDAndInfoEx - Execute the specified cpuid with subleaf and return
 /// the 4 values in the specified arguments.  If we can't run cpuid on the host,
 /// return true.
diff --git a/llvm/tools/llvm-exegesis/lib/Target.h b/llvm/tools/llvm-exegesis/lib/Target.h
--- a/llvm/tools/llvm-exegesis/lib/Target.h
+++ b/llvm/tools/llvm-exegesis/lib/Target.h
@@ -145,7 +145,9 @@
   // Checks hardware and software support for current benchmark mode.
   // Returns an error if the target host does not have support to run the
   // benchmark.
-  virtual Error checkFeatureSupport() const { return Error::success(); }
+  virtual Error checkFeatureSupport(const LLVMState &) const {
+    return Error::success();
+  }
 
   // Creates a snippet generator for the given mode.
   std::unique_ptr<SnippetGenerator>
diff --git a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
--- a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
+++ b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
@@ -22,6 +22,7 @@
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
+#include "llvm/Support/Host.h"
 
 #include <memory>
 #include <string>
@@ -719,7 +720,7 @@
     return Arch == Triple::x86_64 || Arch == Triple::x86;
   }
 
-  Error checkFeatureSupport() const override {
+  Error checkFeatureSupport(const LLVMState &state) const override {
     // LBR is the only feature we conditionally support now.
     // So if LBR is not requested, then we should be able to run the benchmarks.
     if (LbrSamplingPeriod == 0)
@@ -727,13 +728,18 @@
 
 #if defined(__linux__) && defined(HAVE_LIBPFM) &&                              \
     defined(LIBPFM_HAS_FIELD_CYCLES)
-    // If the kernel supports it, the hardware still may not have it.
-    return X86LbrCounter::checkLbrSupport();
-#else
+    // FIXME: Fix this.
+    // https://bugs.llvm.org/show_bug.cgi?id=48918
+    // For now, only do the check if we see an Intel machine because
+    // the counter uses some intel-specific magic and it could
+    // be confuse and think an AMD machine actually has LBR support.
+    if (sys::detail::x86::getVendorSignature() == sys::detail::x86::SIG_INTEL)
+      // If the kernel supports it, the hardware still may not have it.
+      return X86LbrCounter::checkLbrSupport();
+#endif
     return llvm::make_error<llvm::StringError>(
         "LBR not supported on this kernel and/or platform",
         llvm::errc::not_supported);
-#endif
   }
 
   std::unique_ptr<SavedState> withSavedState() const override {
diff --git a/llvm/tools/llvm-exegesis/llvm-exegesis.cpp b/llvm/tools/llvm-exegesis/llvm-exegesis.cpp
--- a/llvm/tools/llvm-exegesis/llvm-exegesis.cpp
+++ b/llvm/tools/llvm-exegesis/llvm-exegesis.cpp
@@ -299,7 +299,7 @@
 
   // Preliminary check to ensure features needed for requested
   // benchmark mode are present on target CPU and/or OS.
-  ExitOnErr(State.getExegesisTarget().checkFeatureSupport());
+  ExitOnErr(State.getExegesisTarget().checkFeatureSupport(State));
 
   const std::unique_ptr<BenchmarkRunner> Runner =
       ExitOnErr(State.getExegesisTarget().createBenchmarkRunner(