Skip to content

Commit dc4c8de

Browse files
authored
Revert "[HLSL] Add Increment/DecrementCounter methods to structured buffers (llvm#114148)" (llvm#117448)
This reverts commit 94bde8c.
1 parent 213b849 commit dc4c8de

File tree

14 files changed

+96
-534
lines changed

14 files changed

+96
-534
lines changed

clang/include/clang/Basic/Builtins.td

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4882,6 +4882,7 @@ def HLSLSaturate : LangBuiltin<"HLSL_LANG"> {
48824882
let Prototype = "void(...)";
48834883
}
48844884

4885+
48854886
def HLSLSelect : LangBuiltin<"HLSL_LANG"> {
48864887
let Spellings = ["__builtin_hlsl_select"];
48874888
let Attributes = [NoThrow, Const];
@@ -4906,12 +4907,6 @@ def HLSLRadians : LangBuiltin<"HLSL_LANG"> {
49064907
let Prototype = "void(...)";
49074908
}
49084909

4909-
def HLSLBufferUpdateCounter : LangBuiltin<"HLSL_LANG"> {
4910-
let Spellings = ["__builtin_hlsl_buffer_update_counter"];
4911-
let Attributes = [NoThrow];
4912-
let Prototype = "uint32_t(...)";
4913-
}
4914-
49154910
def HLSLSplitDouble: LangBuiltin<"HLSL_LANG"> {
49164911
let Spellings = ["__builtin_hlsl_elementwise_splitdouble"];
49174912
let Attributes = [NoThrow, Const];

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7287,8 +7287,6 @@ def err_typecheck_illegal_increment_decrement : Error<
72877287
"cannot %select{decrement|increment}1 value of type %0">;
72887288
def err_typecheck_expect_int : Error<
72897289
"used type %0 where integer is required">;
7290-
def err_typecheck_expect_hlsl_resource : Error<
7291-
"used type %0 where __hlsl_resource_t is required">;
72927290
def err_typecheck_arithmetic_incomplete_or_sizeless_type : Error<
72937291
"arithmetic on a pointer to %select{an incomplete|sizeless}0 type %1">;
72947292
def err_typecheck_pointer_arith_function_type : Error<
@@ -12530,10 +12528,6 @@ def warn_attr_min_eq_max: Warning<
1253012528

1253112529
def err_hlsl_attribute_number_arguments_insufficient_shader_model: Error<
1253212530
"attribute %0 with %1 arguments requires shader model %2 or greater">;
12533-
def err_hlsl_expect_arg_const_int_one_or_neg_one: Error<
12534-
"argument %0 must be constant integer 1 or -1">;
12535-
def err_invalid_hlsl_resource_type: Error<
12536-
"invalid __hlsl_resource_t type attributes">;
1253712531

1253812532
// Layout randomization diagnostics.
1253912533
def err_non_designated_init_used : Error<

clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19409,15 +19409,6 @@ case Builtin::BI__builtin_hlsl_elementwise_isinf: {
1940919409
CGM.getHLSLRuntime().getRadiansIntrinsic(), ArrayRef<Value *>{Op0},
1941019410
nullptr, "hlsl.radians");
1941119411
}
19412-
case Builtin::BI__builtin_hlsl_buffer_update_counter: {
19413-
Value *ResHandle = EmitScalarExpr(E->getArg(0));
19414-
Value *Offset = EmitScalarExpr(E->getArg(1));
19415-
Value *OffsetI8 = Builder.CreateIntCast(Offset, Int8Ty, true);
19416-
return Builder.CreateIntrinsic(
19417-
/*ReturnType=*/Offset->getType(),
19418-
CGM.getHLSLRuntime().getBufferUpdateCounterIntrinsic(),
19419-
ArrayRef<Value *>{ResHandle, OffsetI8}, nullptr);
19420-
}
1942119412
case Builtin::BI__builtin_hlsl_elementwise_splitdouble: {
1942219413

1942319414
assert((E->getArg(0)->getType()->hasFloatingRepresentation() &&

clang/lib/CodeGen/CGHLSLRuntime.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ class CGHLSLRuntime {
102102
GENERATE_HLSL_INTRINSIC_FUNCTION(UClamp, uclamp)
103103

104104
GENERATE_HLSL_INTRINSIC_FUNCTION(CreateHandleFromBinding, handle_fromBinding)
105-
GENERATE_HLSL_INTRINSIC_FUNCTION(BufferUpdateCounter, bufferUpdateCounter)
106105

107106
//===----------------------------------------------------------------------===//
108107
// End of reserved area for HLSL intrinsic getters.

0 commit comments

Comments
 (0)