Skip to content

[AutoBump] Merge with fixes of be96bd74 (Jan 14) (41) [Only tested MLIR] #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2025
+36 −10
Merged

[AutoBump] Merge with fixes of be96bd74 (Jan 14) (41) [Only tested MLIR] #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be96bd7
[mlir][emitc] Don't emit extra semicolon after bracket (#122464)
kchibisov Jan 14, 2025
c8defb3
[AutoBump] Merge with fixes of be96bd74 (Jan 14)
jorickert Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion mlir/lib/Target/Cpp/TranslateToCpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ struct CppEmitter {
LogicalResult emitAttribute(Location loc, Attribute attr);

/// Emits operation 'op' with/without training semicolon or returns failure.
///
/// For operations that should never be followed by a semicolon, like ForOp,
/// the `trailingSemicolon` argument is ignored and a semicolon is not
/// emitted.
LogicalResult emitOperation(Operation &op, bool trailingSemicolon);

/// Emits a reference to type 'type' or returns failure.
Expand Down Expand Up @@ -1762,7 +1766,7 @@ LogicalResult CppEmitter::emitOperation(Operation &op, bool trailingSemicolon) {
return success();

if (isa<cf::CondBranchOp, emitc::DeclareFuncOp, emitc::ForOp, emitc::IfOp,
emitc::SwitchOp, emitc::VerbatimOp>(op)) {
emitc::IncludeOp, emitc::SwitchOp, emitc::VerbatimOp>(op)) {
trailingSemicolon = false;
}

Expand Down
6 changes: 4 additions & 2 deletions mlir/test/Target/Cpp/declare_func.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck %s
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck --match-full-lines %s

// CHECK: int32_t bar(int32_t [[V1:[^ ]*]]);
emitc.declare_func @bar
// CHECK: int32_t bar(int32_t [[V1:[^ ]*]]) {
// CHECK: int32_t bar(int32_t [[V1:[^ ]*]]) {
// CHECK-NEXT: return [[V1]];
// CHECK-NEXT: }
emitc.func @bar(%arg0: i32) -> i32 {
emitc.return %arg0 : i32
}
Expand Down
6 changes: 3 additions & 3 deletions mlir/test/Target/Cpp/for.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck %s -check-prefix=CPP-DEFAULT
// RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck %s -check-prefix=CPP-DECLTOP
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck --match-full-lines %s -check-prefix=CPP-DEFAULT
// RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck --match-full-lines %s -check-prefix=CPP-DECLTOP

func.func @test_for(%arg0 : !emitc.size_t, %arg1 : !emitc.size_t, %arg2 : !emitc.size_t) {
%lb = emitc.expression : !emitc.size_t {
Expand Down Expand Up @@ -160,5 +160,5 @@ func.func @test_for_yield_2() {
return
}
// CPP-DEFAULT: void test_for_yield_2() {
// CPP-DEFAULT: {{.*}}= M_PI
// CPP-DEFAULT: {{.*}}= M_PI;
// CPP-DEFAULT: for (size_t [[IN:.*]] = 0; [[IN]] < 10; [[IN]] += 1) {
4 changes: 2 additions & 2 deletions mlir/test/Target/Cpp/if.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck %s -check-prefix=CPP-DEFAULT
// RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck %s -check-prefix=CPP-DECLTOP
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck --match-full-lines %s -check-prefix=CPP-DEFAULT
// RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck --match-full-lines %s -check-prefix=CPP-DECLTOP

func.func @test_if(%arg0: i1, %arg1: f32) {
emitc.if %arg0 {
Expand Down
20 changes: 20 additions & 0 deletions mlir/test/Target/Cpp/no_extra_semicolon.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck --match-full-lines %s
// RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck --match-full-lines %s

func.func @no_extra_semicolon(%arg0: i1) {
emitc.if %arg0 {
emitc.include "myheader.h"
emitc.if %arg0 {
}
emitc.verbatim "return;"
}
return
}
// CHECK: void no_extra_semicolon(bool [[V0:[^ ]*]]) {
// CHECK-NEXT: if ([[V0]]) {
// CHECK-NEXT: #include "myheader.h"
// CHECK-NEXT: if ([[V0]]) {
// CHECK-NEXT: }
// CHECK-NEXT: return;
// CHECK-NEXT: }
// CHECK-NEXT: return;
4 changes: 2 additions & 2 deletions mlir/test/Target/Cpp/switch.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck %s -check-prefix=CPP-DEFAULT
// RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck %s -check-prefix=CPP-DECLTOP
// RUN: mlir-translate -mlir-to-cpp %s | FileCheck --match-full-lines %s -check-prefix=CPP-DEFAULT
// RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck --match-full-lines %s -check-prefix=CPP-DECLTOP

// CPP-DEFAULT-LABEL: void emitc_switch_ptrdiff_t() {
// CPP-DEFAULT: ptrdiff_t v1 = 1;
Expand Down
Loading