Revert "[AMDGPU] Add AMDGPU specific variadic operation MCExprs"

llvm/docs/AMDGPUUsage.rst

@@ -1534,25 +1534,6 @@ The AMDGPU backend supports the following calling conventions:
 
      =============================== ==========================================================
 
-AMDGPU MCExpr
--------------
-
-As part of the AMDGPU MC layer, AMDGPU provides the following target specific
-``MCExpr``\s.
-
-  .. table:: AMDGPU MCExpr types:
-     :name: amdgpu-mcexpr-table
-
-     =================== ================= ========================================================
-     MCExpr              Operands          Return value
-     =================== ================= ========================================================
-     ``max(arg, ...)``   1 or more         Variadic signed operation that returns the maximum
-                                           value of all its arguments.
-
-     ``or(arg, ...)``    1 or more         Variadic signed operation that returns the bitwise-or
-                                           result of all its arguments.
-
-     =================== ================= ========================================================
 
 .. _amdgpu-elf-code-object:
 

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "AMDKernelCodeT.h"
-#include "MCTargetDesc/AMDGPUMCExpr.h"
 #include "MCTargetDesc/AMDGPUMCTargetDesc.h"
 #include "MCTargetDesc/AMDGPUTargetStreamer.h"
 #include "SIDefines.h"
@@ -1817,7 +1816,6 @@ class AMDGPUAsmParser : public MCTargetAsmParser {
 
 public:
   void onBeginOfFile() override;
-  bool parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) override;
 
   ParseStatus parseCustomOperand(OperandVector &Operands, unsigned MCK);
 
@@ -8279,59 +8277,6 @@ void AMDGPUAsmParser::onBeginOfFile() {
     getTargetStreamer().EmitDirectiveAMDGCNTarget();
 }
 
-/// Parse AMDGPU specific expressions.
-///
-///  expr ::= or(expr, ...) |
-///           max(expr, ...)
-///
-bool AMDGPUAsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) {
-  using AGVK = AMDGPUVariadicMCExpr::VariadicKind;
-
-  if (isToken(AsmToken::Identifier)) {
-    StringRef TokenId = getTokenStr();
-    AGVK VK = StringSwitch<AGVK>(TokenId)
-                  .Case("max", AGVK::AGVK_Max)
-                  .Case("or", AGVK::AGVK_Or)
-                  .Default(AGVK::AGVK_None);
-
-    if (VK != AGVK::AGVK_None && peekToken().is(AsmToken::LParen)) {
-      SmallVector<const MCExpr *, 4> Exprs;
-      uint64_t CommaCount = 0;
-      lex(); // Eat 'max'/'or'
-      lex(); // Eat '('
-      while (true) {
-        if (trySkipToken(AsmToken::RParen)) {
-          if (Exprs.empty()) {
-            Error(getToken().getLoc(),
-                  "empty " + Twine(TokenId) + " expression");
-            return true;
-          }
-          if (CommaCount + 1 != Exprs.size()) {
-            Error(getToken().getLoc(),
-                  "mismatch of commas in " + Twine(TokenId) + " expression");
-            return true;
-          }
-          Res = AMDGPUVariadicMCExpr::create(VK, Exprs, getContext());
-          return false;
-        }
-        const MCExpr *Expr;
-        if (getParser().parseExpression(Expr, EndLoc))
-          return true;
-        Exprs.push_back(Expr);
-        bool LastTokenWasComma = trySkipToken(AsmToken::Comma);
-        if (LastTokenWasComma)
-          CommaCount++;
-        if (!LastTokenWasComma && !isToken(AsmToken::RParen)) {
-          Error(getToken().getLoc(),
-                "unexpected token in " + Twine(TokenId) + " expression");
-          return true;
-        }
-      }
-    }
-  }
-  return getParser().parsePrimaryExpr(Res, EndLoc, nullptr);
-}
-
 ParseStatus AMDGPUAsmParser::parseOModSI(OperandVector &Operands) {
   StringRef Name = getTokenStr();
   if (Name == "mul") {

llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt

@@ -5,7 +5,6 @@ add_llvm_component_library(LLVMAMDGPUDesc
   AMDGPUInstPrinter.cpp
   AMDGPUMCAsmInfo.cpp
   AMDGPUMCCodeEmitter.cpp
-  AMDGPUMCExpr.cpp
   AMDGPUMCTargetDesc.cpp
   AMDGPUTargetStreamer.cpp
   R600InstPrinter.cpp