Skip to content

LLVM Submodule update #495

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

LLVM Submodule update #495

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
b4a67d8
LLVM Submodule update
frej Oct 4, 2023
75d169e
arc-runtime: Support rustc >= 1.72
frej Oct 5, 2023
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
2 changes: 1 addition & 1 deletion arc-mlir/llvm-project
Open in desktop
Submodule llvm-project updated 18025 files
2 changes: 1 addition & 1 deletion arc-mlir/src/include/Arc/Arc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <mlir/IR/Builders.h>
#include <mlir/IR/BuiltinOps.h>
#include <mlir/IR/Dialect.h>
#include <mlir/IR/FunctionInterfaces.h>
#include <mlir/Interfaces/FunctionInterfaces.h>
#include <mlir/IR/Operation.h>
#include <mlir/Interfaces/CallInterfaces.h>
#include <mlir/Interfaces/InferTypeOpInterface.h>
Expand Down
2 changes: 1 addition & 1 deletion arc-mlir/src/include/Rust/Rust.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <mlir/IR/Builders.h>
#include <mlir/IR/BuiltinOps.h>
#include <mlir/IR/Dialect.h>
#include <mlir/IR/FunctionInterfaces.h>
#include <mlir/Interfaces/FunctionInterfaces.h>
#include <mlir/IR/Operation.h>
#include <mlir/Interfaces/CallInterfaces.h>
#include <mlir/Interfaces/ControlFlowInterfaces.h>
Expand Down
6 changes: 5 additions & 1 deletion arc-mlir/src/include/Rust/Rust.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#ifndef OP_BASE
include "../../mlir/include/mlir/IR/OpBase.td"
include "../../mlir/include/mlir/IR/FunctionInterfaces.td"
include "../../mlir/include/mlir/Interfaces/FunctionInterfaces.td"
include "../../mlir/include/mlir/Interfaces/CallInterfaces.td"
include "../../mlir/include/mlir/Interfaces/InferTypeOpInterface.td"
include "../../mlir/include/mlir/Interfaces/SideEffectInterfaces.td"
Expand Down Expand Up @@ -221,6 +221,8 @@ def Rust_RustFuncOp : Rust_Op<"func",
return getFunctionType().cast<FunctionType>().getResults();
}

Region *getCallableRegion() { return &getBody(); }

/// Hook for FunctionOpInterface verifier.
LogicalResult verifyType();

Expand Down Expand Up @@ -257,6 +259,8 @@ def Rust_RustExtFuncOp : Rust_Op<"extfunc",
return getFunctionType().cast<FunctionType>().getResults();
}

Region *getCallableRegion() { return &getEmptyBody(); }

/// Hook for FunctionOpInterface verifier.
LogicalResult verifyType();

Expand Down
20 changes: 10 additions & 10 deletions arc-mlir/src/lib/Arc/Dialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ OpFoldResult arc::AndOp::fold(FoldAdaptor operands) {
if (getLhs() == getRhs())
return getRhs();

return constFoldBinaryOp<IntegerAttr>(operands.getOperands(),
[](APInt a, APInt b) { return a & b; });
return constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
operands.getOperands(), [](APInt a, APInt b) { return a & b; });
}

//===----------------------------------------------------------------------===//
Expand Down Expand Up @@ -234,7 +234,7 @@ OpFoldResult DivIOp::fold(FoldAdaptor operands) {
bool isUnsigned = getType().isUnsignedInteger();
// Don't fold if it would overflow or if it requires a division by zero.
bool overflowOrDiv0 = false;
auto result = constFoldBinaryOp<IntegerAttr>(
auto result = constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
operands.getOperands(), [&](APInt a, APInt b) {
if (overflowOrDiv0 || !b) {
overflowOrDiv0 = true;
Expand Down Expand Up @@ -439,7 +439,7 @@ OpFoldResult AddIOp::fold(FoldAdaptor operands) {

bool isUnsigned = getType().isUnsignedInteger();
bool overflowDetected = false;
auto result = constFoldBinaryOp<IntegerAttr>(
auto result = constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
operands.getOperands(), [&](APInt a, APInt b) {
if (overflowDetected)
return a;
Expand All @@ -466,7 +466,7 @@ OpFoldResult MulIOp::fold(FoldAdaptor operands) {

// Don't fold if it would overflow
bool overflow = false;
auto result = constFoldBinaryOp<IntegerAttr>(
auto result = constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
operands.getOperands(), [&](APInt a, APInt b) {
if (overflow || !b) {
overflow = true;
Expand All @@ -491,8 +491,8 @@ OpFoldResult arc::OrOp::fold(FoldAdaptor operands) {
if (getLhs() == getRhs())
return getRhs();

return constFoldBinaryOp<IntegerAttr>(operands.getOperands(),
[](APInt a, APInt b) { return a | b; });
return constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
operands.getOperands(), [](APInt a, APInt b) { return a | b; });
}

//===----------------------------------------------------------------------===//
Expand Down Expand Up @@ -665,7 +665,7 @@ OpFoldResult SubIOp::fold(FoldAdaptor operands) {

bool isUnsigned = getType().isUnsignedInteger();
bool overflowDetected = false;
auto result = constFoldBinaryOp<IntegerAttr>(
auto result = constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
operands.getOperands(), [&](APInt a, APInt b) {
if (overflowDetected)
return a;
Expand All @@ -689,8 +689,8 @@ OpFoldResult arc::XOrOp::fold(FoldAdaptor operands) {
if (getLhs() == getRhs())
return Builder(getContext()).getZeroAttr(getType());

return constFoldBinaryOp<IntegerAttr>(operands.getOperands(),
[](APInt a, APInt b) { return a ^ b; });
return constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
operands.getOperands(), [](APInt a, APInt b) { return a ^ b; });
}

//===----------------------------------------------------------------------===//
Expand Down
2 changes: 1 addition & 1 deletion arc-mlir/src/tests/arc-to-rust/spawn.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module @arctorustspawn {
%out : !arc.stream.sink<si32>) {
arc.spawn @id(%in, %out) : (!arc.stream.source<si32>,
!arc.stream.sink<si32>) -> ()
// CHECK: "rust.spawn"(%arg0, %arg1) {callee = @id} : (!rust<<i32>>, !rust<<i32>>) -> ()
// CHECK: "rust.spawn"(%arg0, %arg1) <{callee = @id}> : (!rust<<i32>>, !rust<<i32>>) -> ()
return
}
}
4 changes: 2 additions & 2 deletions arc-runtime/macros/src/proc_macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ pub fn wait(input: TokenStream) -> TokenStream {

fn generate_wrapper(id: &syn::Ident) -> (pm2::TokenStream, impl Fn(syn::Expr) -> pm2::TokenStream) {
let span = id.span().unwrap().start();
let line = span.line;
let column = span.column;
let line = span.line();
let column = span.column();
let abstract_id: syn::Ident = new_id(format!("Wrapper_{}_{}", line, column));
let concrete_id: syn::Ident = new_id(format!("ConcreteWrapper_{}_{}", line, column));
let sharable_wrapper_mod_id = new_id(format!("sharable_{}", abstract_id));
Expand Down