Revert unneeded SPIR-V target changes

Author: Alexander Johnston

clang/include/clang/Basic/BuiltinsSPIRVVK.td

@@ -12,5 +12,3 @@ include "clang/Basic/BuiltinsSPIRVBase.td"
 def reflect : SPIRVBuiltin<"void(...)", [NoThrow, Const]>;
 def faceforward : SPIRVBuiltin<"void(...)", [NoThrow, Const, CustomTypeChecking]>;
 def refract : SPIRVBuiltin<"void(...)", [NoThrow, Const, CustomTypeChecking]>;
-def ddx_coarse : SPIRVBuiltin<"void(...)", [NoThrow, Const, CustomTypeChecking]>;
-def ddy_coarse : SPIRVBuiltin<"void(...)", [NoThrow, Const, CustomTypeChecking]>;

clang/lib/CodeGen/TargetBuiltins/SPIR.cpp

@@ -151,18 +151,6 @@ Value *CodeGenFunction::EmitSPIRVBuiltinExpr(unsigned BuiltinID,
         Intrinsic::spv_global_offset,
         ArrayRef<Value *>{EmitScalarExpr(E->getArg(0))}, nullptr,
         "spv.global.offset");
-  case SPIRV::BI__builtin_spirv_ddx_coarse:
-    return Builder.CreateIntrinsic(
-        /*ReturnType=*/getTypes().ConvertType(E->getType()),
-        Intrinsic::spv_ddx_coarse,
-        ArrayRef<Value *>{EmitScalarExpr(E->getArg(0))}, nullptr,
-        "spv.ddx.coarse");
-  case SPIRV::BI__builtin_spirv_ddy_coarse:
-    return Builder.CreateIntrinsic(
-        /*ReturnType=*/getTypes().ConvertType(E->getType()),
-        Intrinsic::spv_ddy_coarse,
-        ArrayRef<Value *>{EmitScalarExpr(E->getArg(0))}, nullptr,
-        "spv.ddy.coarse");
   }
   return nullptr;
 }

clang/lib/Sema/SemaSPIRV.cpp

@@ -46,19 +46,6 @@ static bool CheckAllArgsHaveSameType(Sema *S, CallExpr *TheCall) {
   return false;
 }
 
-static bool CheckAllArgTypesAreCorrect(
-    Sema *S, CallExpr *TheCall,
-    llvm::function_ref<bool(Sema *S, SourceLocation Loc, int ArgOrdinal,
-                            clang::QualType PassedType)>
-        Check) {
-  for (unsigned I = 0; I < TheCall->getNumArgs(); ++I) {
-    Expr *Arg = TheCall->getArg(I);
-    if (Check(S, Arg->getBeginLoc(), I + 1, Arg->getType()))
-      return true;
-  }
-  return false;
-}
-
 static bool CheckAllArgTypesAreCorrect(
     Sema *S, CallExpr *TheCall,
     llvm::ArrayRef<
@@ -373,19 +360,6 @@ bool SemaSPIRV::CheckSPIRVBuiltinFunctionCall(const TargetInfo &TI,
   case SPIRV::BI__builtin_spirv_generic_cast_to_ptr_explicit: {
     return checkGenericCastToPtr(SemaRef, TheCall);
   }
-  case SPIRV::BI__builtin_spirv_ddx_coarse:
-  case SPIRV::BI__builtin_spirv_ddy_coarse: {
-    if (SemaRef.checkArgCount(TheCall, 1))
-      return true;
-
-    if (CheckAllArgTypesAreCorrect(&SemaRef, TheCall,
-                                   CheckFloatOrHalfRepresentation))
-      return true;
-
-    QualType RetTy = TheCall->getArg(0)->getType();
-    TheCall->setType(RetTy);
-    break;
-  }
   }
   return false;
 }