Subzero: Transform suitable Load/Arith/Store sequences into RMW ops.

src/IceInst.cpp

Index: src/IceInst.cpp
diff --git a/src/IceInst.cpp b/src/IceInst.cpp
index de082bbb111e67d2f559f495d3c97656c40f8463..30d50662c165c9a2322c3978c3f2721a5c782459 100644
--- a/src/IceInst.cpp
+++ b/src/IceInst.cpp
@@ -422,9 +422,16 @@ InstSelect::InstSelect(Cfg *Func, Variable *Dest, Operand *Condition,
 }
 
 InstStore::InstStore(Cfg *Func, Operand *Data, Operand *Addr)
-    : InstHighLevel(Func, Inst::Store, 2, nullptr) {
+    : InstHighLevel(Func, Inst::Store, 3, nullptr) {
   addSource(Data);
   addSource(Addr);
+  // The 3rd operand is a dummy placeholder for the RMW beacon.
+  addSource(Data);

[jvoung (off chromium), 2015/06/16 17:59:21]

Would it be safer to have nullptr as the dummy? Then the getRmwBeacon() would be
dyn_cast_or_null<...>(). Otherwise what happens if Data is a variable. Would the
Beacon be right?

[Jim Stichnoth, 2015/06/17 00:15:40]

There's a strong assumption that source operands are non-null (see e.g. the
assert in Inst::addSource()), so that's not a possibility.

The main requirement for the default value is that it does not change the
liveness analysis for existing variables in the Cfg.  One possibility is to use
an operand that contains no variables, such as a constant 0 or undef.  But I'm
not thrilled about doing a locked constant pool lookup for that.  Instead, I
chose to reuse the Data operand because if it contains any uses of variables, it
doesn't affect liveness whether there are one versus two uses of the same
variable.

+}
+
+void InstStore::setRmwBeacon(Variable *Beacon) {
+  Dest = llvm::dyn_cast<Variable>(getData());

[jvoung (off chromium), 2015/06/16 17:59:21]

is this okay if Data isn't a variable when setting the rmw beacon?

[Jim Stichnoth, 2015/06/17 00:15:40]

Yes - the RMW optimization should only be calling setRmwBeacon when Data is the
same as the Dest of the preceding arithmetic instruction.

But if that doesn't happen, and Data is not a variable, then Dest gets set to
nullptr and the Store instruction cannot be DCE'd and so the RMW instruction
lowering will remove itself.

+  Srcs[2] = Beacon;
 }
 
 InstSwitch::InstSwitch(Cfg *Func, SizeT NumCases, Operand *Source,
@@ -747,11 +754,18 @@ void InstStore::dump(const Cfg *Func) const {
     return;
   Ostream &Str = Func->getContext()->getStrDump();
   Type Ty = getData()->getType();
+  dumpDest(Func);
+  if (Dest)
+    Str << " = ";
   Str << "store " << Ty << " ";
   getData()->dump(Func);
   Str << ", " << Ty << "* ";
   getAddr()->dump(Func);
   Str << ", align " << typeAlignInBytes(Ty);
+  if (getRmwBeacon()) {
+    Str << ", beacon ";
+    getRmwBeacon()->dump(Func);
+  }
 }
 
 void InstSwitch::dump(const Cfg *Func) const {