1 files changed, 1 insertions, 111 deletions

diff --git a/src/gpu-compute/gpu_dyn_inst.hh b/src/gpu-compute/gpu_dyn_inst.hh
index 9e63c4459..1f7bb65ca 100644
--- a/src/gpu-compute/gpu_dyn_inst.hh
+++ b/src/gpu-compute/gpu_dyn_inst.hh
@@ -39,6 +39,7 @@
 #include <cstdint>
 #include <string>
 
+#include "base/amo.hh"
 #include "base/logging.hh"
 #include "enums/MemType.hh"
 #include "enums/StorageClassType.hh"
@@ -48,37 +49,6 @@
 class GPUStaticInst;
 
 template<typename T>
-class AtomicOpAnd : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-
-    AtomicOpAnd(T _a) : a(_a) { }
-    void execute(T *b) { *b &= a; }
-    AtomicOpFunctor* clone () { return new AtomicOpAnd(a); }
-};
-
-template<typename T>
-class AtomicOpOr : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-    AtomicOpOr(T _a) : a(_a) { }
-    void execute(T *b) { *b |= a; }
-    AtomicOpFunctor* clone () { return new AtomicOpOr(a); }
-};
-
-template<typename T>
-class AtomicOpXor : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-    AtomicOpXor(T _a) : a(_a) {}
-    void execute(T *b) { *b ^= a; }
-    AtomicOpFunctor* clone () { return new AtomicOpXor(a); }
-};
-
-template<typename T>
 class AtomicOpCAS : public TypedAtomicOpFunctor<T>
 {
   public:
@@ -108,86 +78,6 @@ class AtomicOpCAS : public TypedAtomicOpFunctor<T>
     AtomicOpFunctor* clone () { return new AtomicOpCAS(c, s, computeUnit); }
 };
 
-template<typename T>
-class AtomicOpExch : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-    AtomicOpExch(T _a) : a(_a) { }
-    void execute(T *b) { *b = a; }
-    AtomicOpFunctor* clone () { return new AtomicOpExch(a); }
-};
-
-template<typename T>
-class AtomicOpAdd : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-    AtomicOpAdd(T _a) : a(_a) { }
-    void execute(T *b) { *b += a; }
-    AtomicOpFunctor* clone () { return new AtomicOpAdd(a); }
-};
-
-template<typename T>
-class AtomicOpSub : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-    AtomicOpSub(T _a) : a(_a) { }
-    void execute(T *b) { *b -= a; }
-    AtomicOpFunctor* clone () { return new AtomicOpSub(a); }
-};
-
-template<typename T>
-class AtomicOpInc : public TypedAtomicOpFunctor<T>
-{
-  public:
-    AtomicOpInc() { }
-    void execute(T *b) { *b += 1; }
-    AtomicOpFunctor* clone () { return new AtomicOpInc(); }
-};
-
-template<typename T>
-class AtomicOpDec : public TypedAtomicOpFunctor<T>
-{
-  public:
-    AtomicOpDec() {}
-    void execute(T *b) { *b -= 1; }
-    AtomicOpFunctor* clone () { return new AtomicOpDec(); }
-};
-
-template<typename T>
-class AtomicOpMax : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-    AtomicOpMax(T _a) : a(_a) { }
-
-    void
-    execute(T *b)
-    {
-        if (a > *b)
-            *b = a;
-    }
-    AtomicOpFunctor* clone () { return new AtomicOpMax(a); }
-};
-
-template<typename T>
-class AtomicOpMin : public TypedAtomicOpFunctor<T>
-{
-  public:
-    T a;
-    AtomicOpMin(T _a) : a(_a) {}
-
-    void
-    execute(T *b)
-    {
-        if (a < *b)
-            *b = a;
-    }
-    AtomicOpFunctor* clone () { return new AtomicOpMin(a); }
-};
-
 typedef enum
 {
     VT_32,