allow alternatives in subaction statements

Author: drblallo

lib/dialect/CMakeLists.txt

@@ -1,4 +1,4 @@
-rlcAddLibrary(dialect src/Dialect.cpp  src/Types.cpp src/Operations.cpp src/Conversion.cpp src/EmitMain.cpp src/TypeCheck.cpp src/Interfaces.cpp src/SymbolTable.cpp src/ActionArgumentAnalysis.cpp src/LowerActionPass.cpp src/LowerArrayCalls.cpp src/LowerToCf.cpp src/ActionStatementsToCoro.cpp src/OverloadResolver.cpp src/LowerIsOperationsPass.cpp src/InstantiateTemplatesPass.cpp src/LowerAssignPass.cpp src/EmitImplicitAssignPass.cpp src/LowerConstructOpPass.cpp src/EmitImplicitInitPass.cpp src/EmitImplicitDestructorInvocationsPass.cpp src/LowerForFieldOpPass.cpp src/EmitEnumEntitiesPass.cpp src/SortTypeDeclarationsPass.cpp src/AddOutOfBoundsCheckPass.cpp src/PrintIRPass.cpp src/ExtractPreconditionPass.cpp src/LowerAssertsPass.cpp src/AddPreconditionsCheckPass.cpp src/ActionLiveness.cpp src/UncheckedAstToDot.cpp src/RewriteCallSignaturesPass.cpp src/RemoveUselessAllocaPass.cpp src/MembeFunctionsToRegularFunctionsPass.cpp src/LowerInitializerListsPass.cpp src/Enums.cpp src/HoistAllocaPass.cpp src/RemoveUninitConstructsPass.cpp src/ConstraintsAnalysis.cpp src/TypeInterface.cpp src/SerializeRLPass.cpp src/Attrs.cpp src/DebugInfo.cpp src/LowerForLoopsPass.cpp)
+rlcAddLibrary(dialect src/Dialect.cpp  src/Types.cpp src/Operations.cpp src/Conversion.cpp src/EmitMain.cpp src/TypeCheck.cpp src/Interfaces.cpp src/SymbolTable.cpp src/ActionArgumentAnalysis.cpp src/LowerActionPass.cpp src/LowerArrayCalls.cpp src/LowerToCf.cpp src/ActionStatementsToCoro.cpp src/OverloadResolver.cpp src/LowerIsOperationsPass.cpp src/InstantiateTemplatesPass.cpp src/LowerAssignPass.cpp src/EmitImplicitAssignPass.cpp src/LowerConstructOpPass.cpp src/EmitImplicitInitPass.cpp src/EmitImplicitDestructorInvocationsPass.cpp src/LowerForFieldOpPass.cpp src/EmitEnumEntitiesPass.cpp src/SortTypeDeclarationsPass.cpp src/AddOutOfBoundsCheckPass.cpp src/PrintIRPass.cpp src/ExtractPreconditionPass.cpp src/LowerAssertsPass.cpp src/AddPreconditionsCheckPass.cpp src/ActionLiveness.cpp src/UncheckedAstToDot.cpp src/RewriteCallSignaturesPass.cpp src/RemoveUselessAllocaPass.cpp src/MembeFunctionsToRegularFunctionsPass.cpp src/LowerInitializerListsPass.cpp src/Enums.cpp src/HoistAllocaPass.cpp src/RemoveUninitConstructsPass.cpp src/ConstraintsAnalysis.cpp src/TypeInterface.cpp src/SerializeRLPass.cpp src/Attrs.cpp src/DebugInfo.cpp src/LowerForLoopsPass.cpp src/LowerSubActionStatements.cpp)
 target_link_libraries(dialect PUBLIC rlc::utils MLIRSupport MLIRDialect MLIRLLVMDialect MLIRLLVMIRTransforms MLIRControlFlowDialect)
 
 set(tblgen ${LLVM_BINARY_DIR}/bin/mlir-tblgen)

lib/dialect/src/Conversion.cpp

@@ -879,6 +879,38 @@ class LeftShiftRewriter
 	}
 };
 
+class LowerIsDoneOp: public mlir::OpConversionPattern<mlir::rlc::IsDoneOp>
+{
+	using mlir::OpConversionPattern<mlir::rlc::IsDoneOp>::OpConversionPattern;
+
+	mlir::LogicalResult matchAndRewrite(
+			mlir::rlc::IsDoneOp op,
+			OpAdaptor adaptor,
+			mlir::ConversionPatternRewriter& rewriter) const final
+	{
+		auto alloca = makeAlloca(rewriter, rewriter.getI8Type(), op.getLoc());
+		auto loadedIndex = makeAlignedLoad(
+				rewriter, rewriter.getI64Type(), adaptor.getCoroFrame(), op.getLoc());
+		auto mask = rewriter.create<mlir::LLVM::ConstantOp>(
+				op.getLoc(), rewriter.getI64Type(), rewriter.getI64IntegerAttr(-1));
+
+		auto result = rewriter.create<mlir::LLVM::ICmpOp>(
+				op.getLoc(),
+				rewriter.getI1Type(),
+				mlir::LLVM::ICmpPredicate::eq,
+				loadedIndex,
+				mask);
+
+		auto extended = rewriter.create<mlir::LLVM::ZExtOp>(
+				op.getLoc(), rewriter.getI8Type(), result);
+
+		makeAlignedStore(rewriter, extended, alloca, op.getLoc());
+
+		rewriter.replaceOp(op, alloca);
+		return mlir::LogicalResult::success();
+	}
+};
+
 class BitAndRewriter: public mlir::OpConversionPattern<mlir::rlc::BitAndOp>
 {
 	using mlir::OpConversionPattern<mlir::rlc::BitAndOp>::OpConversionPattern;
@@ -2265,6 +2297,7 @@ namespace mlir::rlc
 							converter, &getContext(), diGenerator, debug_info)
 					.add<ReferenceRewriter>(converter, &getContext())
 					.add<BuiltinAsPtrRewriter>(converter, &getContext())
+					.add<LowerIsDoneOp>(converter, &getContext())
 					.add<ClassDeclarationRewriter>(converter, &getContext())
 					.add<ExplicitConstructRewriter>(converter, &getContext())
 					.add<AbortRewriter>(

lib/dialect/src/LowerSubActionStatements.cpp

@@ -0,0 +1,47 @@
+/*
+Copyright 2024 Massimo Fioravanti
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	 http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+#include "llvm/ADT/TypeSwitch.h"
+#include "mlir/IR/BuiltinDialect.h"
+#include "rlc/dialect/Operations.hpp"
+#include "rlc/dialect/Passes.hpp"
+
+namespace mlir::rlc
+{
+#define GEN_PASS_DEF_LOWERSUBACTIONSTATEMENTS
+#include "rlc/dialect/Passes.inc"
+
+	struct LowerSubActionStatements
+			: impl::LowerSubActionStatementsBase<LowerSubActionStatements>
+	{
+		void runOnOperation() override
+		{
+			mlir::IRRewriter rewriter(getOperation());
+			llvm::SmallVector<mlir::rlc::SubActionInfo, 4> ops;
+			getOperation().walk([&](mlir::rlc::SubActionInfo statement) {
+				ops.push_back(statement);
+			});
+
+			for (auto op : ops)
+			{
+				mlir::Block& block = op.getBody().front();
+				while (not block.empty())
+					block.front().moveBefore(op);
+				op.erase();
+			}
+		}
+	};
+
+}	 // namespace mlir::rlc