Skip to content

Commit 9803edb

Browse files
committed
Fix comment
Created using spr 1.3.5
2 parents e09508c + a102342 commit 9803edb

File tree

393 files changed

+62243
-8120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+62243
-8120
lines changed

clang/docs/ClangFormatStyleOptions.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6015,6 +6015,16 @@ the configuration (without a prefix: ``Auto``).
60156015
#include "B/A.h" #include "B/a.h"
60166016
#include "B/a.h" #include "a/b.h"
60176017

6018+
* ``bool IgnoreExtension`` When sorting includes in each block, only take file extensions into
6019+
account if two includes compare equal otherwise.
6020+
6021+
.. code-block:: c++
6022+
6023+
true: false:
6024+
# include "A.h" vs. # include "A-util.h"
6025+
# include "A.inc" # include "A.h"
6026+
# include "A-util.h" # include "A.inc"
6027+
60186028

60196029
.. _SortJavaStaticImport:
60206030

clang/include/clang/Basic/BuiltinsAMDGPU.def

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,10 @@ TARGET_BUILTIN(__builtin_amdgcn_s_wait_tensorcnt, "vIUs", "n", "gfx1250-insts")
671671

672672
TARGET_BUILTIN(__builtin_amdgcn_tanh_bf16, "yy", "nc", "bf16-trans-insts")
673673
TARGET_BUILTIN(__builtin_amdgcn_rcp_bf16, "yy", "nc", "bf16-trans-insts")
674+
TARGET_BUILTIN(__builtin_amdgcn_rsq_bf16, "yy", "nc", "bf16-trans-insts")
675+
TARGET_BUILTIN(__builtin_amdgcn_log_bf16, "yy", "nc", "bf16-trans-insts")
676+
TARGET_BUILTIN(__builtin_amdgcn_exp2_bf16, "yy", "nc", "bf16-trans-insts")
677+
TARGET_BUILTIN(__builtin_amdgcn_sin_bf16, "yy", "nc", "bf16-trans-insts")
674678

675679
TARGET_BUILTIN(__builtin_amdgcn_cvt_f16_fp8, "hiIi", "nc", "gfx1250-insts")
676680
TARGET_BUILTIN(__builtin_amdgcn_cvt_f16_bf8, "hiIi", "nc", "gfx1250-insts")

clang/include/clang/Basic/BuiltinsSPIRVVK.td

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ include "clang/Basic/BuiltinsSPIRVBase.td"
1111

1212
def reflect : SPIRVBuiltin<"void(...)", [NoThrow, Const]>;
1313
def faceforward : SPIRVBuiltin<"void(...)", [NoThrow, Const, CustomTypeChecking]>;
14+
def refract : SPIRVBuiltin<"void(...)", [NoThrow, Const, CustomTypeChecking]>;

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12368,7 +12368,7 @@ def err_export_using_internal : Error<
1236812368
"using declaration referring to %1 with %select{internal|module|unknown}0 "
1236912369
"linkage cannot be exported">;
1237012370
def err_export_not_in_module_interface : Error<
12371-
"export declaration can only be used within a module purview">;
12371+
"export declaration can only be used within a module interface">;
1237212372
def err_export_inline_not_defined : Error<
1237312373
"inline function not defined%select{| before the private module fragment}0">;
1237412374
def err_export_partition_impl : Error<
@@ -13489,6 +13489,12 @@ def err_acc_invalid_default_type
1348913489
def err_acc_device_type_multiple_archs
1349013490
: Error<"OpenACC 'device_type' clause on a 'set' construct only permits "
1349113491
"one architecture">;
13492+
def warn_acc_var_referenced_lacks_op
13493+
: Warning<"variable of type %0 referenced in OpenACC '%1' clause does not "
13494+
"have a %enum_select<AccVarReferencedReason>{%DefCtor{default "
13495+
"constructor}|%Dtor{destructor}}2; reference has no effect">,
13496+
InGroup<DiagGroup<"openacc-var-lacks-operation">>,
13497+
DefaultError;
1349213498

1349313499
// AMDGCN builtins diagnostics
1349413500
def err_amdgcn_load_lds_size_invalid_value : Error<"invalid size value">;

clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,22 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
129129
cir::BoolAttr getTrueAttr() { return getCIRBoolAttr(true); }
130130
cir::BoolAttr getFalseAttr() { return getCIRBoolAttr(false); }
131131

132+
mlir::Value createComplexCreate(mlir::Location loc, mlir::Value real,
133+
mlir::Value imag) {
134+
auto resultComplexTy = cir::ComplexType::get(real.getType());
135+
return create<cir::ComplexCreateOp>(loc, resultComplexTy, real, imag);
136+
}
137+
138+
mlir::Value createComplexReal(mlir::Location loc, mlir::Value operand) {
139+
auto operandTy = mlir::cast<cir::ComplexType>(operand.getType());
140+
return create<cir::ComplexRealOp>(loc, operandTy.getElementType(), operand);
141+
}
142+
143+
mlir::Value createComplexImag(mlir::Location loc, mlir::Value operand) {
144+
auto operandTy = mlir::cast<cir::ComplexType>(operand.getType());
145+
return create<cir::ComplexImagOp>(loc, operandTy.getElementType(), operand);
146+
}
147+
132148
mlir::Value createNot(mlir::Value value) {
133149
return create<cir::UnaryOp>(value.getLoc(), value.getType(),
134150
cir::UnaryOpKind::Not, value);
@@ -169,6 +185,11 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
169185
return create<cir::ContinueOp>(loc);
170186
}
171187

188+
mlir::Value createUnaryOp(mlir::Location loc, cir::UnaryOpKind kind,
189+
mlir::Value operand) {
190+
return create<cir::UnaryOp>(loc, kind, operand);
191+
}
192+
172193
mlir::TypedAttr getConstPtrAttr(mlir::Type type, int64_t value) {
173194
return cir::ConstPtrAttr::get(type, getI64IntegerAttr(value));
174195
}

clang/include/clang/CIR/Dialect/IR/CIROps.td

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,6 +2934,45 @@ def CIR_ByteSwapOp : CIR_BitOpBase<"byte_swap",
29342934
}];
29352935
}
29362936

2937+
//===----------------------------------------------------------------------===//
2938+
// RotateOp
2939+
//===----------------------------------------------------------------------===//
2940+
2941+
def CIR_RotateOp : CIR_Op<"rotate", [Pure, SameOperandsAndResultType]> {
2942+
let summary = "Rotate the bits in the operand integer";
2943+
let description = [{
2944+
The `cir.rotate` rotates the bits in `input` by the given amount `amount`.
2945+
The rotate direction is specified by the `left` and `right` keyword.
2946+
2947+
`input` must be an unsigned integer and its width must be either 8, 16, 32,
2948+
or 64. The types of `input`, `amount`, and the result must all match.
2949+
2950+
Example:
2951+
2952+
```mlir
2953+
%r = cir.rotate left %0, %1 : !u32i
2954+
%r = cir.rotate right %0, %1 : !u32i
2955+
```
2956+
}];
2957+
2958+
let results = (outs CIR_IntType:$result);
2959+
let arguments = (ins
2960+
CIR_UIntOfWidths<[8, 16, 32, 64]>:$input,
2961+
CIR_IntType:$amount,
2962+
UnitAttr:$rotateLeft
2963+
);
2964+
2965+
let assemblyFormat = [{
2966+
(`left` $rotateLeft^) : (`right`)?
2967+
$input `,` $amount `:` type($result) attr-dict
2968+
}];
2969+
2970+
let extraClassDeclaration = [{
2971+
bool isRotateLeft() { return getRotateLeft(); }
2972+
bool isRotateRight() { return !getRotateLeft(); }
2973+
}];
2974+
}
2975+
29372976
//===----------------------------------------------------------------------===//
29382977
// Assume Operations
29392978
//===----------------------------------------------------------------------===//

clang/include/clang/CIR/MissingFeatures.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ struct MissingFeatures {
254254
static bool dtorCleanups() { return false; }
255255
static bool completeDtors() { return false; }
256256
static bool vtableInitialization() { return false; }
257+
static bool msvcBuiltins() { return false; }
257258

258259
// Missing types
259260
static bool dataMemberType() { return false; }

clang/include/clang/Format/Format.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4385,8 +4385,18 @@ struct FormatStyle {
43854385
/// #include "B/a.h" #include "a/b.h"
43864386
/// \endcode
43874387
bool IgnoreCase;
4388+
/// When sorting includes in each block, only take file extensions into
4389+
/// account if two includes compare equal otherwise.
4390+
/// \code
4391+
/// true: false:
4392+
/// # include "A.h" vs. # include "A-util.h"
4393+
/// # include "A.inc" # include "A.h"
4394+
/// # include "A-util.h" # include "A.inc"
4395+
/// \endcode
4396+
bool IgnoreExtension;
43884397
bool operator==(const SortIncludesOptions &R) const {
4389-
return Enabled == R.Enabled && IgnoreCase == R.IgnoreCase;
4398+
return Enabled == R.Enabled && IgnoreCase == R.IgnoreCase &&
4399+
IgnoreExtension == R.IgnoreExtension;
43904400
}
43914401
bool operator!=(const SortIncludesOptions &R) const {
43924402
return !(*this == R);

clang/include/clang/Sema/Overload.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,6 @@ class Sema;
350350
LLVM_PREFERRED_TYPE(bool)
351351
unsigned BindsToRvalue : 1;
352352

353-
/// Whether this was an identity conversion with qualification
354-
/// conversion for the implicit object argument.
355-
LLVM_PREFERRED_TYPE(bool)
356-
unsigned IsImplicitObjectArgumentQualificationConversion : 1;
357-
358353
/// Whether this binds an implicit object argument to a
359354
/// non-static member function without a ref-qualifier.
360355
LLVM_PREFERRED_TYPE(bool)
@@ -453,11 +448,11 @@ class Sema;
453448
#endif
454449
return true;
455450
}
451+
if (!C.hasSameType(getFromType(), getToType(2)))
452+
return false;
456453
if (BindsToRvalue && IsLvalueReference)
457454
return false;
458-
if (IsImplicitObjectArgumentQualificationConversion)
459-
return C.hasSameUnqualifiedType(getFromType(), getToType(2));
460-
return C.hasSameType(getFromType(), getToType(2));
455+
return true;
461456
}
462457

463458
ImplicitConversionRank getRank() const;

clang/lib/Basic/Targets/SPIR.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,9 @@ class LLVM_LIBRARY_VISIBILITY SPIR32TargetInfo : public SPIRTargetInfo {
264264
PointerWidth = PointerAlign = 32;
265265
SizeType = TargetInfo::UnsignedInt;
266266
PtrDiffType = IntPtrType = TargetInfo::SignedInt;
267+
// SPIR32 has support for atomic ops if atomic extension is enabled.
268+
// Take the maximum because it's possible the Host supports wider types.
269+
MaxAtomicInlineWidth = std::max<unsigned char>(MaxAtomicInlineWidth, 32);
267270
resetDataLayout("e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-"
268271
"v96:128-v192:256-v256:256-v512:512-v1024:1024-G1");
269272
}
@@ -281,6 +284,9 @@ class LLVM_LIBRARY_VISIBILITY SPIR64TargetInfo : public SPIRTargetInfo {
281284
PointerWidth = PointerAlign = 64;
282285
SizeType = TargetInfo::UnsignedLong;
283286
PtrDiffType = IntPtrType = TargetInfo::SignedLong;
287+
// SPIR64 has support for atomic ops if atomic extension is enabled.
288+
// Take the maximum because it's possible the Host supports wider types.
289+
MaxAtomicInlineWidth = std::max<unsigned char>(MaxAtomicInlineWidth, 64);
284290
resetDataLayout("e-i64:64-v16:16-v24:32-v32:32-v48:64-"
285291
"v96:128-v192:256-v256:256-v512:512-v1024:1024-G1");
286292
}

0 commit comments

Comments
 (0)