Skip to content

Commit bb390ad

Browse files
author
z1.cciauto
committed
merge main into amd-staging
2 parents ebd2c74 + d926ec3 commit bb390ad

File tree

40 files changed

+1321
-188
lines changed

40 files changed

+1321
-188
lines changed

‎clang/lib/Driver/OffloadBundler.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ bool OffloadTargetInfo::operator==(const OffloadTargetInfo &Target) const {
145145

146146
std::string OffloadTargetInfo::str() const {
147147
std::string NormalizedTriple;
148-
// Unfortunately we need some special sauce for AMDGPU because all the runtime
149-
// assumes the triple to be "amdgcn-amd-amdhsa-" (empty environment) instead
150-
// of "amdgcn-amd-amdhsa-unknown". It's gonna be very tricky to patch
151-
// different layers of runtime.
152-
if (Triple.isAMDGPU()) {
148+
// Unfortunately we need some special sauce for AMDHSA because all the runtime
149+
// assumes the triple to be "amdgcn/spirv64-amd-amdhsa-" (empty environment)
150+
// instead of "amdgcn/spirv64-amd-amdhsa-unknown". It's gonna be very tricky
151+
// to patch different layers of runtime.
152+
if (Triple.getOS() == Triple::OSType::AMDHSA) {
153153
NormalizedTriple = Triple.normalize(Triple::CanonicalForm::THREE_IDENT);
154154
NormalizedTriple.push_back('-');
155155
} else {

‎clang/lib/Format/DefinitionBlockSeparator.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ void DefinitionBlockSeparator::separateBlocks(
137137
const auto MayPrecedeDefinition = [&](const int Direction = -1) {
138138
assert(Direction >= -1);
139139
assert(Direction <= 1);
140+
141+
if (Lines[OpeningLineIndex]->First->is(TT_CSharpGenericTypeConstraint))
142+
return true;
143+
140144
const size_t OperateIndex = OpeningLineIndex + Direction;
141145
assert(OperateIndex < Lines.size());
142146
const auto &OperateLine = Lines[OperateIndex];

‎clang/test/Driver/clang-offload-bundler-standardize.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@
1111
//
1212
// RUN: echo 'Content of device file 1' > %t.tgt1
1313
// RUN: echo 'Content of device file 2' > %t.tgt2
14-
14+
// RUN: echo 'Content of device file 3' > %t.tgt3
1515
//
1616
// Check code object compatibility for archive unbundling
1717
//
1818
// Create an object bundle
19-
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908 -input=%t.o -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle
19+
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908,hip-spirv64-amd-amdhsa--amdgcnspirv -input=%t.o -input=%t.tgt1 -input=%t.tgt2 -input=%t.tgt3 -output=%t.bundle
2020

21-
// RUN: clang-offload-bundler -unbundle -type=o -targets=hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908 -input=%t.bundle -output=%t-hip-amdgcn-amd-amdhsa--gfx906.bc -output=%t-hip-amdgcn-amd-amdhsa--gfx908.bc -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=BUNDLE
21+
// RUN: clang-offload-bundler -unbundle -type=o -targets=hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908,hip-spirv64-amd-amdhsa--amdgcnspirv -input=%t.bundle -output=%t-hip-amdgcn-amd-amdhsa--gfx906.bc -output=%t-hip-amdgcn-amd-amdhsa--gfx908.bc -output=%t-hip-spirv64-amd-amdhsa--amdgcnspirv.bc -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=BUNDLE
2222
// BUNDLE: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx906] : [Target: hip-amdgcn-amd-amdhsa--gfx906]
2323
// BUNDLE: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx908] : [Target: hip-amdgcn-amd-amdhsa--gfx908]
24+
// BUNDLE: Compatible: Exact match: [CodeObject: hip-spirv64-amd-amdhsa--amdgcnspirv] : [Target: hip-spirv64-amd-amdhsa--amdgcnspirv]
2425

2526
// Some code so that we can create a binary out of this file.
2627
int A = 0;

‎clang/unittests/Format/DefinitionBlockSeparatorTest.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,11 @@ TEST_F(DefinitionBlockSeparatorTest, CSharp) {
574574
"\r\n"
575575
"public class FoobarClass {\r\n"
576576
" int foobar;\r\n"
577+
"}\r\n"
578+
"\r\n"
579+
"public class LogFactory<TLogger>\r\n"
580+
" where TLogger : class, new() {\r\n"
581+
" int i;\r\n"
577582
"}",
578583
Style);
579584
}

‎flang/lib/Optimizer/Transforms/AffinePromotion.cpp

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ struct AffineIfAnalysis;
4949
/// second when doing rewrite.
5050
struct AffineFunctionAnalysis {
5151
explicit AffineFunctionAnalysis(mlir::func::FuncOp funcOp) {
52-
for (fir::DoLoopOp op : funcOp.getOps<fir::DoLoopOp>())
53-
loopAnalysisMap.try_emplace(op, op, *this);
52+
funcOp->walk([&](fir::DoLoopOp doloop) {
53+
loopAnalysisMap.try_emplace(doloop, doloop, *this);
54+
});
5455
}
5556

5657
AffineLoopAnalysis getChildLoopAnalysis(fir::DoLoopOp op) const;
@@ -102,10 +103,23 @@ struct AffineLoopAnalysis {
102103
return true;
103104
}
104105

106+
bool analysisResults(fir::DoLoopOp loopOperation) {
107+
if (loopOperation.getFinalValue() &&
108+
!loopOperation.getResult(0).use_empty()) {
109+
LLVM_DEBUG(
110+
llvm::dbgs()
111+
<< "AffineLoopAnalysis: cannot promote loop final value\n";);
112+
return false;
113+
}
114+
115+
return true;
116+
}
117+
105118
bool analyzeLoop(fir::DoLoopOp loopOperation,
106119
AffineFunctionAnalysis &functionAnalysis) {
107120
LLVM_DEBUG(llvm::dbgs() << "AffineLoopAnalysis: \n"; loopOperation.dump(););
108121
return analyzeMemoryAccess(loopOperation) &&
122+
analysisResults(loopOperation) &&
109123
analyzeBody(loopOperation, functionAnalysis);
110124
}
111125

@@ -461,14 +475,28 @@ class AffineLoopConversion : public mlir::OpRewritePattern<fir::DoLoopOp> {
461475
LLVM_ATTRIBUTE_UNUSED auto loopAnalysis =
462476
functionAnalysis.getChildLoopAnalysis(loop);
463477
auto &loopOps = loop.getBody()->getOperations();
478+
auto resultOp = cast<fir::ResultOp>(loop.getBody()->getTerminator());
479+
auto results = resultOp.getOperands();
480+
auto loopResults = loop->getResults();
464481
auto loopAndIndex = createAffineFor(loop, rewriter);
465482
auto affineFor = loopAndIndex.first;
466483
auto inductionVar = loopAndIndex.second;
467484

485+
if (loop.getFinalValue()) {
486+
results = results.drop_front();
487+
loopResults = loopResults.drop_front();
488+
}
489+
468490
rewriter.startOpModification(affineFor.getOperation());
469491
affineFor.getBody()->getOperations().splice(
470492
std::prev(affineFor.getBody()->end()), loopOps, loopOps.begin(),
471493
std::prev(loopOps.end()));
494+
rewriter.replaceAllUsesWith(loop.getRegionIterArgs(),
495+
affineFor.getRegionIterArgs());
496+
if (!results.empty()) {
497+
rewriter.setInsertionPointToEnd(affineFor.getBody());
498+
rewriter.create<affine::AffineYieldOp>(resultOp->getLoc(), results);
499+
}
472500
rewriter.finalizeOpModification(affineFor.getOperation());
473501

474502
rewriter.startOpModification(loop.getOperation());
@@ -479,7 +507,8 @@ class AffineLoopConversion : public mlir::OpRewritePattern<fir::DoLoopOp> {
479507

480508
LLVM_DEBUG(llvm::dbgs() << "AffineLoopConversion: loop rewriten to:\n";
481509
affineFor.dump(););
482-
rewriter.replaceOp(loop, affineFor.getOperation()->getResults());
510+
rewriter.replaceAllUsesWith(loopResults, affineFor->getResults());
511+
rewriter.eraseOp(loop);
483512
return success();
484513
}
485514

@@ -503,7 +532,7 @@ class AffineLoopConversion : public mlir::OpRewritePattern<fir::DoLoopOp> {
503532
ValueRange(op.getUpperBound()),
504533
mlir::AffineMap::get(0, 1,
505534
1 + mlir::getAffineSymbolExpr(0, op.getContext())),
506-
step);
535+
step, op.getIterOperands());
507536
return std::make_pair(affineFor, affineFor.getInductionVar());
508537
}
509538

@@ -528,7 +557,7 @@ class AffineLoopConversion : public mlir::OpRewritePattern<fir::DoLoopOp> {
528557
genericUpperBound.getResult(),
529558
mlir::AffineMap::get(0, 1,
530559
1 + mlir::getAffineSymbolExpr(0, op.getContext())),
531-
1);
560+
1, op.getIterOperands());
532561
rewriter.setInsertionPointToStart(affineFor.getBody());
533562
auto actualIndex = rewriter.create<affine::AffineApplyOp>(
534563
op.getLoc(), actualIndexMap,

‎flang/test/Fir/affine-promotion.fir

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,89 @@ func.func @loop_with_if(%a: !arr_d1, %v: f32) {
131131
// CHECK: }
132132
// CHECK: return
133133
// CHECK: }
134+
135+
func.func @loop_with_result(%arg0: !fir.ref<!fir.array<100xf32>>, %arg1: !fir.ref<!fir.array<100x100xf32>>, %arg2: !fir.ref<!fir.array<100xf32>>) -> f32 {
136+
%c1 = arith.constant 1 : index
137+
%cst = arith.constant 0.000000e+00 : f32
138+
%c100 = arith.constant 100 : index
139+
%0 = fir.shape %c100 : (index) -> !fir.shape<1>
140+
%1 = fir.shape %c100, %c100 : (index, index) -> !fir.shape<2>
141+
%2 = fir.alloca i32
142+
%3:2 = fir.do_loop %arg3 = %c1 to %c100 step %c1 iter_args(%arg4 = %cst) -> (index, f32) {
143+
%8 = fir.array_coor %arg0(%0) %arg3 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
144+
%9 = fir.load %8 : !fir.ref<f32>
145+
%10 = arith.addf %arg4, %9 fastmath<contract> : f32
146+
%11 = arith.addi %arg3, %c1 overflow<nsw> : index
147+
fir.result %11, %10 : index, f32
148+
}
149+
%4:2 = fir.do_loop %arg3 = %c1 to %c100 step %c1 iter_args(%arg4 = %3#1) -> (index, f32) {
150+
%8 = fir.array_coor %arg1(%1) %c1, %arg3 : (!fir.ref<!fir.array<100x100xf32>>, !fir.shape<2>, index, index) -> !fir.ref<f32>
151+
%9 = fir.convert %8 : (!fir.ref<f32>) -> !fir.ref<!fir.array<100xf32>>
152+
%10 = fir.do_loop %arg5 = %c1 to %c100 step %c1 iter_args(%arg6 = %arg4) -> (f32) {
153+
%12 = fir.array_coor %9(%0) %arg5 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
154+
%13 = fir.load %12 : !fir.ref<f32>
155+
%14 = arith.addf %arg6, %13 fastmath<contract> : f32
156+
fir.result %14 : f32
157+
}
158+
%11 = arith.addi %arg3, %c1 overflow<nsw> : index
159+
fir.result %11, %10 : index, f32
160+
}
161+
%5:2 = fir.do_loop %arg3 = %c1 to %c100 step %c1 iter_args(%arg4 = %4#1, %arg5 = %cst) -> (f32, f32) {
162+
%8 = fir.array_coor %arg0(%0) %arg3 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
163+
%9 = fir.load %8 : !fir.ref<f32>
164+
%10 = arith.addf %arg4, %9 fastmath<contract> : f32
165+
%11 = fir.array_coor %arg2(%0) %arg3 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
166+
%12 = fir.load %11 : !fir.ref<f32>
167+
%13 = arith.addf %arg5, %12 fastmath<contract> : f32
168+
fir.result %10, %13 : f32, f32
169+
}
170+
%6 = arith.addf %5#0, %5#1 fastmath<contract> : f32
171+
%7 = fir.convert %4#0 : (index) -> i32
172+
fir.store %7 to %2 : !fir.ref<i32>
173+
return %6 : f32
174+
}
175+
176+
// CHECK-LABEL: func.func @loop_with_result(
177+
// CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.array<100xf32>>,
178+
// CHECK-SAME: %[[ARG1:.*]]: !fir.ref<!fir.array<100x100xf32>>,
179+
// CHECK-SAME: %[[ARG2:.*]]: !fir.ref<!fir.array<100xf32>>) -> f32 {
180+
// CHECK: %[[VAL_0:.*]] = arith.constant 1 : index
181+
// CHECK: %[[VAL_1:.*]] = arith.constant 0.000000e+00 : f32
182+
// CHECK: %[[VAL_2:.*]] = arith.constant 100 : index
183+
// CHECK: %[[VAL_3:.*]] = fir.shape %[[VAL_2]] : (index) -> !fir.shape<1>
184+
// CHECK: %[[VAL_4:.*]] = fir.shape %[[VAL_2]], %[[VAL_2]] : (index, index) -> !fir.shape<2>
185+
// CHECK: %[[VAL_5:.*]] = fir.alloca i32
186+
// CHECK: %[[VAL_6:.*]] = fir.convert %[[ARG0]] : (!fir.ref<!fir.array<100xf32>>) -> memref<?xf32>
187+
// CHECK: %[[VAL_7:.*]] = affine.for %[[VAL_8:.*]] = %[[VAL_0]] to #{{.*}}(){{\[}}%[[VAL_2]]] iter_args(%[[VAL_9:.*]] = %[[VAL_1]]) -> (f32) {
188+
// CHECK: %[[VAL_10:.*]] = affine.apply #{{.*}}(%[[VAL_8]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
189+
// CHECK: %[[VAL_11:.*]] = affine.load %[[VAL_6]]{{\[}}%[[VAL_10]]] : memref<?xf32>
190+
// CHECK: %[[VAL_12:.*]] = arith.addf %[[VAL_9]], %[[VAL_11]] fastmath<contract> : f32
191+
// CHECK: affine.yield %[[VAL_12]] : f32
192+
// CHECK: }
193+
// CHECK: %[[VAL_13:.*]]:2 = fir.do_loop %[[VAL_14:.*]] = %[[VAL_0]] to %[[VAL_2]] step %[[VAL_0]] iter_args(%[[VAL_15:.*]] = %[[VAL_7]]) -> (index, f32) {
194+
// CHECK: %[[VAL_16:.*]] = fir.array_coor %[[ARG1]](%[[VAL_4]]) %[[VAL_0]], %[[VAL_14]] : (!fir.ref<!fir.array<100x100xf32>>, !fir.shape<2>, index, index) -> !fir.ref<f32>
195+
// CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_16]] : (!fir.ref<f32>) -> !fir.ref<!fir.array<100xf32>>
196+
// CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_17]] : (!fir.ref<!fir.array<100xf32>>) -> memref<?xf32>
197+
// CHECK: %[[VAL_19:.*]] = affine.for %[[VAL_20:.*]] = %[[VAL_0]] to #{{.*}}(){{\[}}%[[VAL_2]]] iter_args(%[[VAL_21:.*]] = %[[VAL_15]]) -> (f32) {
198+
// CHECK: %[[VAL_22:.*]] = affine.apply #{{.*}}(%[[VAL_20]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
199+
// CHECK: %[[VAL_23:.*]] = affine.load %[[VAL_18]]{{\[}}%[[VAL_22]]] : memref<?xf32>
200+
// CHECK: %[[VAL_24:.*]] = arith.addf %[[VAL_21]], %[[VAL_23]] fastmath<contract> : f32
201+
// CHECK: affine.yield %[[VAL_24]] : f32
202+
// CHECK: }
203+
// CHECK: %[[VAL_25:.*]] = arith.addi %[[VAL_14]], %[[VAL_0]] overflow<nsw> : index
204+
// CHECK: fir.result %[[VAL_25]], %[[VAL_19]] : index, f32
205+
// CHECK: }
206+
// CHECK: %[[VAL_26:.*]] = fir.convert %[[ARG2]] : (!fir.ref<!fir.array<100xf32>>) -> memref<?xf32>
207+
// CHECK: %[[VAL_27:.*]]:2 = affine.for %[[VAL_28:.*]] = %[[VAL_0]] to #{{.*}}(){{\[}}%[[VAL_2]]] iter_args(%[[VAL_29:.*]] = %[[VAL_30:.*]]#1, %[[VAL_31:.*]] = %[[VAL_1]]) -> (f32, f32) {
208+
// CHECK: %[[VAL_32:.*]] = affine.apply #{{.*}}(%[[VAL_28]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
209+
// CHECK: %[[VAL_33:.*]] = affine.load %[[VAL_6]]{{\[}}%[[VAL_32]]] : memref<?xf32>
210+
// CHECK: %[[VAL_34:.*]] = arith.addf %[[VAL_29]], %[[VAL_33]] fastmath<contract> : f32
211+
// CHECK: %[[VAL_35:.*]] = affine.load %[[VAL_26]]{{\[}}%[[VAL_32]]] : memref<?xf32>
212+
// CHECK: %[[VAL_36:.*]] = arith.addf %[[VAL_31]], %[[VAL_35]] fastmath<contract> : f32
213+
// CHECK: affine.yield %[[VAL_34]], %[[VAL_36]] : f32, f32
214+
// CHECK: }
215+
// CHECK: %[[VAL_37:.*]] = arith.addf %[[VAL_38:.*]]#0, %[[VAL_38]]#1 fastmath<contract> : f32
216+
// CHECK: %[[VAL_39:.*]] = fir.convert %[[VAL_40:.*]]#0 : (index) -> i32
217+
// CHECK: fir.store %[[VAL_39]] to %[[VAL_5]] : !fir.ref<i32>
218+
// CHECK: return %[[VAL_37]] : f32
219+
// CHECK: }

‎libc/config/darwin/arm/entrypoints.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ set(TARGET_LIBM_ENTRYPOINTS
135135
libc.src.fenv.feupdateenv
136136

137137
# math.h entrypoints
138+
libc.src.math.acos
138139
libc.src.math.acosf
139140
libc.src.math.acoshf
140141
libc.src.math.asin

‎libc/config/linux/aarch64/entrypoints.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ set(TARGET_LIBM_ENTRYPOINTS
410410
libc.src.fenv.feupdateenv
411411

412412
# math.h entrypoints
413+
libc.src.math.acos
413414
libc.src.math.acosf
414415
libc.src.math.acoshf
415416
libc.src.math.asin

‎libc/config/linux/arm/entrypoints.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ set(TARGET_LIBM_ENTRYPOINTS
242242
libc.src.fenv.feupdateenv
243243

244244
# math.h entrypoints
245+
libc.src.math.acos
245246
libc.src.math.acosf
246247
libc.src.math.acoshf
247248
libc.src.math.asin

‎libc/config/linux/riscv/entrypoints.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ set(TARGET_LIBM_ENTRYPOINTS
416416
libc.src.fenv.feupdateenv
417417

418418
# math.h entrypoints
419+
libc.src.math.acos
419420
libc.src.math.acosf
420421
libc.src.math.acoshf
421422
libc.src.math.asin

0 commit comments

Comments
 (0)