Revert "Fix OpGroupNonUniformBroadcast version requirement (#2378)"

This reverts commit 1d53bf4.

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVInstruction.h

@@ -276,9 +276,6 @@ class SPIRVInstTemplateBase : public SPIRVInstruction {
  } else
  SPIRVEntry::setWordCount(WC);
  Ops = TheOps;
- // The required SPIR-V version depends on the operands for some
- // instructions.
- updateModuleVersion();
  }
  void setWordCount(SPIRVWord TheWordCount) override {
  SPIRVEntry::setWordCount(TheWordCount);
@@ -298,11 +295,6 @@ class SPIRVInstTemplateBase : public SPIRVInstruction {
 
  /// Get operand as value.
  /// If the operand is a literal, return it as a uint32 constant.
- const SPIRVValue *getOpValue(int I) const {
- return isOperandLiteral(I) ? Module->getLiteralAsConstant(Ops[I])
- : getValue(Ops[I]);
- }
-
  SPIRVValue *getOpValue(int I) {
  return isOperandLiteral(I) ? Module->getLiteralAsConstant(Ops[I])
  : getValue(Ops[I]);
@@ -323,10 +315,6 @@ class SPIRVInstTemplateBase : public SPIRVInstruction {
  return Operands;
  }
 
- virtual const SPIRVValue *getOperand(unsigned I) const {
- return getOpValue(I);
- }
-
  virtual SPIRVValue *getOperand(unsigned I) {
  return getOpValue(I);
  }
@@ -2515,22 +2503,6 @@ class SPIRVGroupNonUniformBallotInst : public SPIRVInstTemplateBase {
  SPIRVCapVec getRequiredCapability() const override {
  return getVec(CapabilityGroupNonUniformBallot);
  }
-
- SPIRVWord getRequiredSPIRVVersion() const override {
- switch (OpCode) {
- case OpGroupNonUniformBroadcast: {
- assert(Ops.size() == 3 && "Expecting (Execution, Value, Id) operands");
- if (!isConstantOpCode(getOperand(2)->getOpCode())) {
- // Before version 1.5, Id must come from a constant instruction.
- return static_cast<SPIRVWord>(VersionNumber::SPIRV_1_5);
- }
- break;
- }
- default:
- break;
- }
- return static_cast<SPIRVWord>(VersionNumber::SPIRV_1_3);
- }
 };
 
 #define _SPIRV_OP(x, ...) \