This is an archive of the discontinued LLVM Phabricator instance.

Differential D77834

[flang] Fix for bug 45487
ClosedPublic

Authored by schweitz on Apr 9 2020, 3:10 PM.

Details

Reviewers
DavidTruby
jdoerfert
Commits
rGd58a405de656: [flang] Upstream patch to enable the fir-ops test. bug 45487
Summary

https://bugs.llvm.org/show_bug.cgi?id=45487

Diff Detail

Event Timeline

schweitz created this revision.Apr 9 2020, 3:10 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptApr 9 2020, 3:11 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
DavidTruby requested changes to this revision.Apr 9 2020, 3:22 PM

Can you also remove the XFAIL from the test in this patch?
Thanks!

This revision now requires changes to proceed.Apr 9 2020, 3:22 PM
Harbormaster completed remote builds in B52582: Diff 256422.Apr 9 2020, 3:30 PM
schweitz added a comment.Apr 9 2020, 5:27 PM

Oops. Sure.

schweitz updated this revision to Diff 256474.Apr 9 2020, 6:48 PM
jdoerfert added a comment.Apr 9 2020, 7:35 PM

FTR, I recommend commit messages that explain the commit in isolation. With PRXXXX or bug 45487 you get your reference.

DavidTruby accepted this revision.Apr 14 2020, 1:19 AM

LGTM, I think you can go ahead and commit this

This revision is now accepted and ready to land.Apr 14 2020, 1:19 AM
Closed by commit rGd58a405de656: [flang] Upstream patch to enable the fir-ops test. bug 45487 (authored by schweitz). · Explain WhyApr 14 2020, 10:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
flang/
include/
flang/
Optimizer/
Dialect/
5 lines
test/
Fir/
1 line

Diff 257396

flang/include/flang/Optimizer/Dialect/FIROps.td

Show First 20 Lines • Show All 2,461 Lines • ▼ Show 20 Linesdef fir_GlobalOp : fir_Op<"global", [IsolatedFromAbove, Symbol]> {
let arguments = (ins let arguments = (ins
StrAttr:$sym_name, StrAttr:$sym_name,
OptionalAttr<AnyAttr>:$initval, OptionalAttr<AnyAttr>:$initval,
UnitAttr:$constant, UnitAttr:$constant,
TypeAttr:$type TypeAttr:$type
); );
let results = (outs fir_ReferenceType:$resultType);
let regions = (region AtMostRegion<1>:$region); let regions = (region AtMostRegion<1>:$region);
let parser = [{ let parser = [{
// Parse the name as a symbol reference attribute. // Parse the name as a symbol reference attribute.
SymbolRefAttr nameAttr; SymbolRefAttr nameAttr;
if (parser.parseAttribute(nameAttr, mlir::SymbolTable::getSymbolAttrName(), if (parser.parseAttribute(nameAttr, mlir::SymbolTable::getSymbolAttrName(),
result.attributes)) result.attributes))
return failure(); return failure();
Show All 23 Lines let parser = [{
result.addAttribute(typeAttrName(), mlir::TypeAttr::get(globalType)); result.addAttribute(typeAttrName(), mlir::TypeAttr::get(globalType));
if (!simpleInitializer) { if (!simpleInitializer) {
// Parse the optional initializer body. // Parse the optional initializer body.
if (parser.parseRegion(*result.addRegion(), llvm::None, llvm::None)) if (parser.parseRegion(*result.addRegion(), llvm::None, llvm::None))
return failure(); return failure();
} }
auto refTy = AllocaOp::wrapResultType(globalType);
if (parser.addTypeToList(refTy, result.types))
return failure();
return success(); return success();
}]; }];
let printer = [{ let printer = [{
auto varName = getAttrOfType<StringAttr>( auto varName = getAttrOfType<StringAttr>(
mlir::SymbolTable::getSymbolAttrName()).getValue(); mlir::SymbolTable::getSymbolAttrName()).getValue();
p << getOperationName() << " @" << varName; p << getOperationName() << " @" << varName;
if (auto iv = initval().getValueOr(Attribute())) { if (auto iv = initval().getValueOr(Attribute())) {
▲ Show 20 Lines • Show All 227 Lines • Show Last 20 Lines

flang/test/Fir/fir-ops.fir

// Test the FIR operations // Test the FIR operations
// RUN: tco -emit-fir %s | tco -emit-fir | FileCheck %s // RUN: tco -emit-fir %s | tco -emit-fir | FileCheck %s
// UNSUPPORTED: !fir // UNSUPPORTED: !fir
// XFAIL: *
// CHECK-LABEL: func @it1() -> !fir.int<4> // CHECK-LABEL: func @it1() -> !fir.int<4>
func @it1() -> !fir.int<4> func @it1() -> !fir.int<4>
// CHECK-LABEL: func @box1() -> !fir.boxchar<2> // CHECK-LABEL: func @box1() -> !fir.boxchar<2>
func @box1() -> !fir.boxchar<2> func @box1() -> !fir.boxchar<2>
// CHECK-LABEL: func @box2() -> !fir.boxproc<(i32, i32) -> i64> // CHECK-LABEL: func @box2() -> !fir.boxproc<(i32, i32) -> i64>
func @box2() -> !fir.boxproc<(i32, i32) -> i64> func @box2() -> !fir.boxproc<(i32, i32) -> i64>
// CHECK-LABEL: func @box3() -> !fir.box<!fir.type<derived3{f:f32}>> // CHECK-LABEL: func @box3() -> !fir.box<!fir.type<derived3{f:f32}>>
▲ Show 20 Lines • Show All 391 Lines • Show Last 20 Lines