Subzero: Update tests and build scripts for sandboxing.

src/IceInstX8632.h

 //===- subzero/src/IceInstX8632.h - Low-level x86 instructions --*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares the InstX8632 and OperandX8632 classes and
@@ skipping 1013 matching lines @@
 protected:
   bool Locked;
 
   InstX8632Lockable(Cfg *Func, InstKindX8632 Kind, SizeT Maxsrcs,
                     Variable *Dest, bool Locked)
       : InstX8632(Func, Kind, Maxsrcs, Dest), Locked(Locked) {
     // Assume that such instructions are used for Atomics and be careful
     // with optimizations.
     HasSideEffects = Locked;
   }
+  // emitPrefix() and emitSuffix() are a workaround for an apparent
+  // llvm-mc bug in which "lock" is considered a separate instruction
+  // and may be placed in a different bundle from the instruction
+  // being locked, e.g.:
+  //   1e: lock nop
+  //   20: cmpxchg ...

[jvoung (off chromium), 2015/02/23 17:58:36]

Weird, I thought it would have been fixed by:

https://codereview.chromium.org/569773002/diff/140001/test/MC/X86/AlignedBund...

This is with "nacl" as the OS in the target triple?

[Jim Stichnoth, 2015/02/23 21:38:19]

Aha!  The szbuild.py was running llvm-mc with just -target=x86, but it should
also use -triple=i686 or -triple=i686-nacl.  So I can undo that workaround.

+  // The workaround is to emit an explicit bundle_lock/bundle_unlock
+  // for instructions with a lock prefix.
+  void emitPrefix(Ostream &Str) const {
+    if (!ALLOW_DUMP)
+      return;
+    if (Locked)
+      Str << "\t.bundle_lock\n";
+  }
+  void emitSuffix(Ostream &Str) const {
+    if (!ALLOW_DUMP)
+      return;
+    if (Locked)
+      Str << "\n\t.bundle_unlock";
+  }
   ~InstX8632Lockable() override {}
 };
 
 // Mul instruction - unsigned multiply.
 class InstX8632Mul : public InstX8632 {
   InstX8632Mul(const InstX8632Mul &) = delete;
   InstX8632Mul &operator=(const InstX8632Mul &) = delete;
 
 public:
   static InstX8632Mul *create(Cfg *Func, Variable *Dest, Variable *Source1,
@@ skipping 560 matching lines @@
 template <> void InstX8632Pinsr::emitIAS(const Cfg *Func) const;
 template <> void InstX8632Movsx::emitIAS(const Cfg *Func) const;
 template <> void InstX8632Movzx::emitIAS(const Cfg *Func) const;
 template <> void InstX8632Pmull::emitIAS(const Cfg *Func) const;
 template <> void InstX8632Pshufd::emitIAS(const Cfg *Func) const;
 template <> void InstX8632Shufps::emitIAS(const Cfg *Func) const;
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEINSTX8632_H