Remove some unwanted changes.

Author: rlavaee

llvm/include/llvm/CodeGen/MachineBasicBlock.h

@@ -100,12 +100,6 @@ template <> struct DenseMapInfo<MBBSectionID> {
   }
 };
 
-struct PrefetchTarget {
-  StringRef TargetFunction;
-  UniqueBBID TargetBBID;
-  unsigned TargetBBOffset;
-};
-
 template <> struct ilist_traits<MachineInstr> {
 private:
   friend class MachineBasicBlock; // Set by the owning MachineBasicBlock.

llvm/include/llvm/CodeGen/MachineInstr.h

@@ -123,9 +123,8 @@ class MachineInstr
     NoUSWrap = 1 << 20,      // Instruction supports geps
                              // no unsigned signed wrap.
     SameSign = 1 << 21,      // Both operands have the same sign.
-    InBounds = 1 << 22,      // Pointer arithmetic remains inbounds.
+    InBounds = 1 << 22       // Pointer arithmetic remains inbounds.
                              // Implies NoUSWrap.
-    Prefetch = 1 << 23,      // Instruction is a prefetch.
   };
 
 private:

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -120,7 +120,6 @@
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/SMLoc.h"
 #include "llvm/Support/VCSRevision.h"
 #include "llvm/Support/VirtualFileSystem.h"
 #include "llvm/Support/raw_ostream.h"
@@ -180,11 +179,6 @@ static cl::opt<bool> EmitJumpTableSizesSection(
     cl::desc("Emit a section containing jump table addresses and sizes"),
     cl::Hidden, cl::init(false));
 
-static cl::opt<bool> InsertNoopsForPrefetch(
-    "insert-noops-for-prefetch",
-    cl::desc("Whether to insert noops instead of prefetches."), cl::init(false),
-    cl::Hidden);
-
 // This isn't turned on by default, since several of the scheduling models are
 // not completely accurate, and we don't want to be misleading.
 static cl::opt<bool> PrintLatency(
@@ -2131,7 +2125,7 @@ void AsmPrinter::emitFunctionBody() {
         break;
       }
       default:
-         emitInstruction(&MI);
+        emitInstruction(&MI);
 
         auto CountInstruction = [&](const MachineInstr &MI) {
           // Skip Meta instructions inside bundles.