diff --git a/.gitmodules b/.gitmodules index 76f3fd8d077b..22c9b570b863 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "third_party/iree"] - path = third_party/iree - url = https://github.com/google/iree.git [submodule "experimental/iterators/third_party/llvm-project"] path = experimental/iterators/third_party/llvm-project url = https://github.com/llvm/llvm-project.git diff --git a/FIXME b/FIXME deleted file mode 100644 index 8c8943cbd140..000000000000 --- a/FIXME +++ /dev/null @@ -1,11 +0,0 @@ -python -m python.examples.matmul.test - * UnrollOneVectorOp does not implement build_transform_ir - * SingleTilingExpert fails to vectorize if things don't divide and this is reported as a full failure. - * could not find replacement for tracked op (failed to apply: %7 = iree_linalg_transform.outline_loop %6 {func_name = "foo"}) - -python -m python.examples.matvec.test - * SingleTilingExpert fails to vectorize if things don't divide and this is reported as a full failure. - -Port LinalgExt transformations to transform dialect - -Enable the double-tiling and tile-interchange.mlir after landing D121369. diff --git a/include/Dialect/VectorExt/CMakeLists.txt b/include/Dialect/VectorExt/CMakeLists.txt deleted file mode 100644 index 7a83642c3985..000000000000 --- a/include/Dialect/VectorExt/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_mlir_dialect(VectorExtOps vector_ext) diff --git a/include/Dialect/VectorExt/VectorExtBase.td b/include/Dialect/VectorExt/VectorExtBase.td deleted file mode 100644 index 79cb439a6d79..000000000000 --- a/include/Dialect/VectorExt/VectorExtBase.td +++ /dev/null @@ -1,27 +0,0 @@ -//===-- VectorExtBase.td - Vector Extension dialect --------*- tablegen -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef DIALECTS_VECTOREXT_VECTOREXTBASE -#define DIALECTS_VECTOREXT_VECTOREXTBASE - -include "mlir/IR/OpBase.td" - -//===----------------------------------------------------------------------===// -// Dialect definition -//===----------------------------------------------------------------------===// - -def VectorExt_Dialect : Dialect { - let name = "vector_ext"; - let cppNamespace = "::mlir::vector_ext"; - let description = [{ - The `vector_ext` dialect is intended to experiment with new vector operations - that could eventually be added to the Vector dialect. - }]; -} - -#endif // DIALECTS_VECTOREXT_VECTOREXTBASE diff --git a/include/Dialect/VectorExt/VectorExtDialect.h b/include/Dialect/VectorExt/VectorExtDialect.h deleted file mode 100644 index 6d6b0146e28a..000000000000 --- a/include/Dialect/VectorExt/VectorExtDialect.h +++ /dev/null @@ -1,19 +0,0 @@ -//===-- VectorExtDialect.h - Vector Extension dialect ------*- tablegen -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef DIALECTS_VECTOREXT_VECTOREXTBASE_H -#define DIALECTS_VECTOREXT_VECTOREXTBASE_H - -#include "mlir/IR/Dialect.h" -#include "mlir/IR/OpDefinition.h" - -// clang-format off: must be included after all LLVM/MLIR headers -#include "Dialect/VectorExt/VectorExtOpsDialect.h.inc" // IWYU pragma: keep -// clang-format on - -#endif // DIALECTS_VECTOREXT_VECTOREXTBASE_H diff --git a/include/Dialect/VectorExt/VectorExtOps.h b/include/Dialect/VectorExt/VectorExtOps.h deleted file mode 100644 index 9ef93449b16b..000000000000 --- a/include/Dialect/VectorExt/VectorExtOps.h +++ /dev/null @@ -1,30 +0,0 @@ -//===-- VectorExtOps.h - Vector Extension dialect ops ------*- tablegen -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef DIALECTS_VECTOREXT_VECTOREXTOPS_H -#define DIALECTS_VECTOREXT_VECTOREXTOPS_H - -#include "Dialect/VectorExt/VectorExtDialect.h" -#include "mlir/Dialect/Vector/IR/VectorOps.h" -#include "mlir/IR/OpDefinition.h" -#include "mlir/IR/Operation.h" -#include "mlir/Interfaces/ControlFlowInterfaces.h" -#include "mlir/Interfaces/SideEffectInterfaces.h" - -namespace mlir { -namespace vector_ext { - -void buildTerminatedBody(OpBuilder &builder, Location loc); - -} // namespace vector_ext -} // namespace mlir - -#define GET_OP_CLASSES -#include "Dialect/VectorExt/VectorExtOps.h.inc" - -#endif // DIALECTS_VECTOREXT_VECTOREXTOPS_H diff --git a/include/Dialect/VectorExt/VectorExtOps.td b/include/Dialect/VectorExt/VectorExtOps.td deleted file mode 100644 index e4c3e9629814..000000000000 --- a/include/Dialect/VectorExt/VectorExtOps.td +++ /dev/null @@ -1,62 +0,0 @@ -//===-- VectorExtOps.td - Vector Extension dialect ops -----*- tablegen -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef DIALECTS_VECTOREXT_VECTOREXTOPS -#define DIALECTS_VECTOREXT_VECTOREXTOPS - -include "Dialect/VectorExt/VectorExtBase.td" -include "mlir/Interfaces/ControlFlowInterfaces.td" -include "mlir/Interfaces/SideEffectInterfaces.td" - -class VectorExt_Op traits = []> : - Op { - let hasCustomAssemblyFormat = 1; -} - -def VectorExt_PredicateOp : VectorExt_Op<"predicate", - [DeclareOpInterfaceMethods, - SingleBlockImplicitTerminator<"vector_ext::YieldOp">, RecursiveSideEffects]> { - let summary = "vector.predicate operation"; - let description = [{ TODO }]; - - let arguments = (ins VectorOf<[I1]>:$predicateMask, Variadic:$indices, - VectorOf<[I1]>:$incomingMask); - let results = (outs Variadic:$results); - let regions = (region SizedRegion<1>:$truePredicateRegion); - - // TODO: Add falsePredicateRegion. - - let skipDefaultBuilders = 1; - let builders = [ - OpBuilder<(ins "Value":$predicateMask, "ValueRange":$indices, - "Value":$incomingMask)>, - OpBuilder<(ins "TypeRange":$resultTypes, "Value":$predicateMask, - "ValueRange":$indices, "Value":$incomingMask, - CArg<"function_ref", - "buildTerminatedBody">:$truePredicateBuilder)> - ]; -} - -def VectorExt_YieldOp : VectorExt_Op<"yield", [ - NoSideEffect, ReturnLike, Terminator]> { - let summary = "VectorExt yield op"; - let description = [{ - `vector_ext.yield` is a special terminator operation for blocks inside - regions in `vector_ext` ops. - }]; - - let arguments = (ins Variadic:$operands); - - let builders = [ - OpBuilder<(ins), [{ /* nothing to do */ }]>, - ]; - - let assemblyFormat = "attr-dict ($operands^ `:` type($operands))?"; -} - -#endif // DIALECTS_VECTOREXT_VECTOREXTOPS diff --git a/include/Dialect/VectorExt/VectorMaskingUtils.h b/include/Dialect/VectorExt/VectorMaskingUtils.h deleted file mode 100644 index 23799564dc5b..000000000000 --- a/include/Dialect/VectorExt/VectorMaskingUtils.h +++ /dev/null @@ -1,67 +0,0 @@ -//===-- VectorMaskingUtils.h - Utilities for vector masking -----*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef DIALECT_VECTOREXT_VECTORMASKINGUTILS_H_ -#define DIALECT_VECTOREXT_VECTORMASKINGUTILS_H_ - -#include "llvm/ADT/STLExtras.h" -#include "llvm/ADT/SmallVector.h" - -namespace mlir { -namespace func { -class FuncOp; -} // namespace func -class LogicalResult; -class Region; -class OpBuilder; -class Operation; -class Value; -class ValueRange; -class WalkStage; - -namespace vector_ext { -class PredicateOp; - -/// Introduce a vector.predicate op that encloses all the operations in -/// `regionToPredicate` (except its terminator). `createPredicate` is used to -/// create the operations that generate the predicate used by vector.predicate. -/// These operations will be inserted at the beginning of `regionToPredicate`. -/// The new vector.predicate will be inserted right after the operations -/// generating the predicate. -llvm::Optional -predicateOp(OpBuilder &builder, Operation *op, Region *regionToPredicate, - llvm::function_ref createPredicateMask, - ValueRange indexes, llvm::Optional maybeIncomingMask); - -/// Function signature of a masking strategy for generic operations. -using GenericOpMaskingStrategy = - llvm::function_ref &)>; - -/// Traverse `op` and apply masking on all the vector.predicate ops and their -/// enclosing operations using the strategy `maskGenericOp` to mask generic -/// operations other than the vector.predicate. -LogicalResult maskVectorPredicateOps(OpBuilder &builder, Operation *op, - GenericOpMaskingStrategy maskGenericOp); - -//===----------------------------------------------------------------------===// -// Vector Masking Strategies. -//===----------------------------------------------------------------------===// - -/// Masking strategy that only masks vector transfer operations and operations -/// with side effects. Non-side-effecting ops are left unmasked. -void maskGenericOpWithSideEffects( - OpBuilder &builder, Operation *op, Value activeMask, const WalkStage &stage, - llvm::SmallVectorImpl &erasedOps); - -// TODO: Implement full masking strategy. - -} // namespace vector_ext -} // namespace mlir - -#endif // DIALECT_VECTOREXT_VECTORMASKINGUTILS_H_ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt deleted file mode 100644 index 0ca0f41c5af4..000000000000 --- a/lib/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(Dialect) diff --git a/lib/Dialect/CMakeLists.txt b/lib/Dialect/CMakeLists.txt deleted file mode 100644 index 87b979cd5b30..000000000000 --- a/lib/Dialect/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(VectorExt) diff --git a/lib/Dialect/VectorExt/CMakeLists.txt b/lib/Dialect/VectorExt/CMakeLists.txt deleted file mode 100644 index c4a54b3ee5f0..000000000000 --- a/lib/Dialect/VectorExt/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(IR) -add_subdirectory(Transform) diff --git a/lib/Dialect/VectorExt/IR/CMakeLists.txt b/lib/Dialect/VectorExt/IR/CMakeLists.txt deleted file mode 100644 index 2b091ba7dda1..000000000000 --- a/lib/Dialect/VectorExt/IR/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_mlir_library(MLIRVectorExt - VectorExtDialect.cpp - VectorExtOps.cpp - - DEPENDS - mlir-headers - MLIRVectorExtOpsIncGen - - LINK_LIBS PUBLIC - MLIRControlFlowInterfaces - MLIRIR -) diff --git a/lib/Dialect/VectorExt/IR/VectorExtDialect.cpp b/lib/Dialect/VectorExt/IR/VectorExtDialect.cpp deleted file mode 100644 index e79db47c1bc5..000000000000 --- a/lib/Dialect/VectorExt/IR/VectorExtDialect.cpp +++ /dev/null @@ -1,25 +0,0 @@ -//===-- VectorExtDialect.cpp - Vector Extension dialect -------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "Dialect/VectorExt/VectorExtDialect.h" - -#include "Dialect/VectorExt/VectorExtOps.h" -#include "Dialect/VectorExt/VectorExtOpsDialect.cpp.inc" - -namespace mlir { -namespace vector_ext { - -void VectorExtDialect::initialize() { -#define GET_OP_LIST - addOperations< -#include "Dialect/VectorExt/VectorExtOps.cpp.inc" - >(); -} - -} // namespace vector_ext -} // namespace mlir diff --git a/lib/Dialect/VectorExt/IR/VectorExtOps.cpp b/lib/Dialect/VectorExt/IR/VectorExtOps.cpp deleted file mode 100644 index 5fba2f6a92ea..000000000000 --- a/lib/Dialect/VectorExt/IR/VectorExtOps.cpp +++ /dev/null @@ -1,142 +0,0 @@ -//===-- VectorExtOps.h - Vector Extension dialect ops ------*- tablegen -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "Dialect/VectorExt/VectorExtOps.h" - -#include "mlir/IR/Builders.h" -#include "mlir/IR/BuiltinTypes.h" -#include "mlir/IR/OpImplementation.h" - -using namespace mlir; -using namespace mlir::vector_ext; - -//===----------------------------------------------------------------------===// -// PredicateOp -//===----------------------------------------------------------------------===// - -/// Default callback for PredicateOp builders. Inserts a yield without -/// arguments. -void mlir::vector_ext::buildTerminatedBody(OpBuilder &builder, Location loc) { - builder.create(loc); -} - -void PredicateOp::build(OpBuilder &builder, OperationState &result, - Value predicateMask, ValueRange indices, - Value incomingMask) { - build(builder, result, /*resultTypes=*/llvm::None, predicateMask, indices, - incomingMask); -} - -void PredicateOp::build( - OpBuilder &builder, OperationState &result, TypeRange resultTypes, - Value predicateMask, ValueRange indices, Value incomingMask, - function_ref truePredicateBuilder) { - assert(truePredicateBuilder && - "the builder callback for 'truePredicate' must be present"); - - result.addOperands(predicateMask); - result.addOperands(indices); - result.addOperands(incomingMask); - result.addTypes(resultTypes); - - OpBuilder::InsertionGuard guard(builder); - Region *truePredicateRegion = result.addRegion(); - Block *bodyBlock = builder.createBlock(truePredicateRegion); - bodyBlock->addArgument(predicateMask.getType(), result.location); - truePredicateBuilder(builder, result.location); -} - -ParseResult mlir::vector_ext::PredicateOp::parse(OpAsmParser &parser, - OperationState &result) { - // Create the regions for 'truePredicate'. - result.regions.reserve(1); - Region *truePredicateRegion = result.addRegion(); - - auto &builder = parser.getBuilder(); - - // Parse all the operands. - OpAsmParser::UnresolvedOperand predicateMask; - OpAsmParser::UnresolvedOperand incomingMask; - SmallVector indices; - if (parser.parseLParen() || parser.parseOperand(predicateMask) || - parser.parseComma() || - parser.parseOperandList(indices, AsmParser::Delimiter::Square) || - parser.parseComma() || parser.parseOperand(incomingMask) || - parser.parseRParen()) - return failure(); - - // Parse predicate type. - Type maskType; - if (parser.parseColonType(maskType)) - return failure(); - - if (parser.resolveOperand(predicateMask, maskType, result.operands) || - parser.resolveOperands(indices, IndexType::get(builder.getContext()), - result.operands) || - parser.resolveOperand(incomingMask, maskType, result.operands)) - return failure(); - - // Parse optional results type list. - if (parser.parseOptionalArrowTypeList(result.types)) - return failure(); - - // Parse the 'truePredicate' region. - if (parser.parseRegion(*truePredicateRegion, /*arguments=*/{}, - /*argTypes=*/{})) - return failure(); - PredicateOp::ensureTerminator(*truePredicateRegion, builder, result.location); - - // Parse the optional attribute list. - if (parser.parseOptionalAttrDict(result.attributes)) - return failure(); - return success(); -} - -void mlir::vector_ext::PredicateOp::print(OpAsmPrinter &p) { - bool printBlockTerminators = false; - - p << "(" << predicateMask() << ", [" << indices() << "], " << incomingMask() - << ") : " << predicateMask().getType(); - if (!results().empty()) { - p << " -> (" << getResultTypes() << ")"; - // Print yield explicitly if the op defines values. - printBlockTerminators = true; - } - p << " "; - p.printRegion(truePredicateRegion(), - /*printEntryBlockArgs=*/true, - /*printBlockTerminators=*/printBlockTerminators); - - p.printOptionalAttrDict(getOperation()->getAttrs()); -} - -/// Given the region at `index`, or the parent operation if `index` is None, -/// return the successor regions. These are the regions that may be selected -/// during the flow of control. `operands` is a set of optional attributes that -/// correspond to a constant value for each operand, or null if that operand is -/// not a constant. -void PredicateOp::getSuccessorRegions( - Optional index, ArrayRef operands, - SmallVectorImpl ®ions) { - // The `truePredicate` region branch back to the parent operation. - if (index.hasValue()) { - regions.push_back(RegionSuccessor(getResults())); - return; - } - - // The `truePredicate` (and the future `falsePredicate` region) will always - // be executed regardless of the condition since they are not modeling control - // but data flow. - regions.push_back(RegionSuccessor(&truePredicateRegion())); -} - -#define GET_OP_CLASSES -#include "Dialect/VectorExt/VectorExtOps.cpp.inc" - -using namespace mlir; -using namespace mlir::vector_ext; diff --git a/lib/Dialect/VectorExt/Transform/CMakeLists.txt b/lib/Dialect/VectorExt/Transform/CMakeLists.txt deleted file mode 100644 index 594bd3117306..000000000000 --- a/lib/Dialect/VectorExt/Transform/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -add_mlir_library(MLIRVectorExtTransforms - VectorMaskingUtils.cpp - - DEPENDS - mlir-headers - MLIRVectorExt - - LINK_LIBS PUBLIC - MLIRAffineDialect - MLIRGPUOps - MLIRIR - MLIRLinalgDialect - MLIRVectorDialect - MLIRVectorExt - MLIRVectorTransforms - MLIRVectorUtils -) diff --git a/lib/Dialect/VectorExt/Transform/VectorMaskingUtils.cpp b/lib/Dialect/VectorExt/Transform/VectorMaskingUtils.cpp deleted file mode 100644 index 0e6959d290ec..000000000000 --- a/lib/Dialect/VectorExt/Transform/VectorMaskingUtils.cpp +++ /dev/null @@ -1,248 +0,0 @@ -//===- VectorMaskingUtils.cpp - Utilities for vector masking --------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "Dialect/VectorExt/VectorMaskingUtils.h" -#include "Dialect/VectorExt/VectorExtOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Linalg/IR/Linalg.h" -#include "mlir/Dialect/Vector/IR/VectorOps.h" -#include "mlir/IR/AffineMap.h" -#include "mlir/IR/Visitors.h" -#include "mlir/Support/LogicalResult.h" -#include "llvm/ADT/SmallPtrSet.h" - -using namespace mlir; -using namespace mlir::linalg; -using namespace mlir::vector; -using namespace mlir::vector_ext; - -using ExprList = ArrayRef>; - -/// Move the operation range `opRange` before operation `dest`. -static void moveOperationsBefore(llvm::iterator_range opRange, - Operation *dest) { - if (opRange.empty()) - return; - dest->getBlock()->getOperations().splice( - Block::iterator(dest), opRange.begin()->getBlock()->getOperations(), - opRange.begin(), opRange.end()); -} - -/// Iterate over all the definitions produced by the operation range `opRange` -/// and gather those with users outside the range. -static void -getDefsWithUsesOutside(llvm::iterator_range opRange, - SmallVectorImpl &defsWithUsesOutside, - SmallVectorImpl &defTypes) { - SmallPtrSet rangeSet; - for (Operation &op : opRange) - rangeSet.insert(&op); - - for (Operation &op : opRange) - for (Value res : op.getResults()) - for (Operation *user : res.getUsers()) - if (rangeSet.count(user) == 0) { - defsWithUsesOutside.push_back(res); - defTypes.push_back(res.getType()); - break; - } -} - -/// Return a valid incoming mask. If 'maybeIncomingMask' has a value, return it. -/// Otherwise, return an all-one mask. -static Value getIncomingMask(OpBuilder &builder, Location loc, - Optional maybeIncomingMask, Type maskType) { - if (maybeIncomingMask) - return *maybeIncomingMask; - - return builder.create( - loc, maskType, - DenseElementsAttr::get(maskType, builder.getBoolAttr(true))); -} - -/// Introduce a vector.predicate op that encloses all the operations in -/// `regionToPredicate` (except its terminator). `createPredicateMask` is used -/// to create the operations that generate the predicate used by -/// vector.predicate. These operations will be inserted at the beginning of -/// `regionToPredicate`. The new vector.predicate will be inserted right after -/// the operations generating the predicate. -Optional mlir::vector_ext::predicateOp( - OpBuilder &builder, Operation *op, Region *regionToPredicate, - function_ref createPredicateMask, ValueRange indices, - Optional maybeIncomingMask) { - // TODO: Support multi-block regions. - if (!regionToPredicate->hasOneBlock()) - return llvm::None; - - // Compute the range of operations that will be moved within vector.predicate - // and the definitions within the range with users outside the range. - Block &blockToPredicate = regionToPredicate->front(); - auto opsToMove = llvm::make_range(blockToPredicate.begin(), - Block::iterator(blockToPredicate.back())); - - SmallVector defsWithUsesOutside; - SmallVector defTypes; - getDefsWithUsesOutside(opsToMove, defsWithUsesOutside, defTypes); - - // Set the builder insertion point to the beginning of the loop body to insert - // the predicate computation and the vector.predicate. - OpBuilder::InsertionGuard guard(builder); - builder.setInsertionPointToStart(&blockToPredicate); - Value predicateMask = createPredicateMask(builder); - if (!predicateMask) - return llvm::None; - - // Generate the vector.predicate operation and move 'opsToMove' within its - // truePredicateRegion. We have to rewire the def-use chain for those - // definitions within the range that have external uses. Those uses are - // rewired to the results of the vector.predicate. - Location loc = op->getLoc(); - Value incomingMask = - getIncomingMask(builder, loc, maybeIncomingMask, predicateMask.getType()); - auto vecPredOp = builder.create(loc, defTypes, predicateMask, - indices, incomingMask); - - assert(defsWithUsesOutside.size() == vecPredOp.getNumResults() && - "Expected same size"); - for (const auto &en : llvm::enumerate(defsWithUsesOutside)) - en.value().replaceAllUsesWith(vecPredOp.getResult(en.index())); - - Operation *truePredTerminator = - &vecPredOp.truePredicateRegion().front().back(); - moveOperationsBefore(opsToMove, truePredTerminator); - - // The existing terminator of TruePredicateRegion doesn't yield any value. - // Replace it with a new terminator that returns the definitions with uses - // outside that we just moved. - if (vecPredOp.getNumResults() > 0) { - builder.setInsertionPoint(truePredTerminator); - builder.create(loc, defsWithUsesOutside); - truePredTerminator->erase(); - } - - return vecPredOp; -} - -/// Materialize masking on a vector.predicate op by generating the masks to -/// apply to its enclosing operations and erasing the vector.predicate op after -/// inlining its enclosing operations into its parent region. -static void maskPredicateOp(OpBuilder &builder, PredicateOp predOp, - SmallVectorImpl &activeMasks, - const WalkStage &stage, - SmallVectorImpl &erasedOps) { - OpBuilder::InsertionGuard guard(builder); - - // Actions before visiting the TruePredicateRegion: Generate the new active - // mask (= predicate_mask & incoming_mask) influencing the region. - if (stage.isBeforeAllRegions()) { - builder.setInsertionPointToStart(&predOp.truePredicateRegion().front()); - Value trueMask = builder.create( - predOp.getLoc(), predOp.incomingMask(), predOp.predicateMask()); - activeMasks.push_back(trueMask); - return; - } - - // Actions after visiting the TruePredicateRegion: Pop the active mask for the - // TruePredicateRegion. - // if (stage.isAfterRegion(0)) { - // activeMasks.pop_back(); - // return; - // } - - // TODO: Generate complementary mask for FalsePredicateRegion. - // if (stage.isBeforeRegion(1)) { - // return; - // } - - // Actions after all the regions: Move operations outside the vector.predicate - // regions and remove vector.predicate op. - if (stage.isAfterAllRegions()) { - // TODO: Move this to isAfterRegion(0); - activeMasks.pop_back(); - - // Inline truePredicateRegion into parent op (except its terminator). - // TODO: Move this to builder.inlineRegionBefore? - auto &blocksToMove = predOp.truePredicateRegion().getBlocks(); - assert(blocksToMove.size() == 1 && "Expected only one block"); - assert(predOp.getResults().empty() && - "TODO: Support vector.predicate with results"); - auto &opsToMove = blocksToMove.front().getOperations(); - moveOperationsBefore( - llvm::make_range(opsToMove.begin(), std::prev(opsToMove.end())), - predOp); - erasedOps.push_back(predOp); - return; - } -} - -/// Traverse `op` and apply masking on all the vector.predicate ops and their -/// enclosing operations using the strategy `maskGenericOp` to mask generic -/// operations other than the vector.predicate. -// TODO: Add an initMask param to pass a mask that is not all-ones? -LogicalResult mlir::vector_ext::maskVectorPredicateOps( - OpBuilder &builder, Operation *op, GenericOpMaskingStrategy maskGenericOp) { - OpBuilder::InsertionGuard guard(builder); - - // Initialize stack of active masks. An empty stack means that the active mask - // is all-ones (masking is not required). - SmallVector activeMasks; - activeMasks.push_back(Value()); - - // Gather ops for deletion after the walk. - SmallVector erasedOps; - - op->walk([&](Operation *op, const WalkStage &stage) { - if (auto predOp = dyn_cast(op)) - maskPredicateOp(builder, predOp, activeMasks, stage, erasedOps); - else - maskGenericOp(builder, op, activeMasks.back(), stage, erasedOps); - }); - - // Erase ops. - for (Operation *op : erasedOps) - op->erase(); - - return success(); -} - -/// Masking strategy that only masks vector transfer operations and operations -/// with side effects. Non-side-effecting ops are left unmasked. -void mlir::vector_ext::maskGenericOpWithSideEffects( - OpBuilder &builder, Operation *op, Value activeMask, const WalkStage &stage, - SmallVectorImpl &erasedOps) { - // Nothing to do. All-ones mask to apply. - if (!activeMask) - return; - - OpBuilder::InsertionGuard guard(builder); - - if (stage.isBeforeAllRegions()) { - // Mask vector.transfer_read. - if (auto xferReadOp = dyn_cast(op)) { - builder.setInsertionPoint(op); - auto newXferOp = builder.create( - op->getLoc(), xferReadOp.getType(), xferReadOp.getSource(), - xferReadOp.getIndices(), xferReadOp.getPermutationMap(), - xferReadOp.getPadding(), activeMask, xferReadOp.getInBoundsAttr()); - xferReadOp.replaceAllUsesWith(newXferOp.getResult()); - erasedOps.push_back(xferReadOp); - return; - } - - // Mask vector.transfer_write. - if (auto xferWriteOp = dyn_cast(op)) { - builder.setInsertionPoint(op); - builder.create( - op->getLoc(), xferWriteOp.getVector(), xferWriteOp.getSource(), - xferWriteOp.getIndices(), xferWriteOp.getPermutationMapAttr(), - activeMask, xferWriteOp.getInBoundsAttr()); - erasedOps.push_back(xferWriteOp); - return; - } - } -} diff --git a/test/lib/CMakeLists.txt b/test/lib/CMakeLists.txt deleted file mode 100644 index 0ca0f41c5af4..000000000000 --- a/test/lib/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(Dialect) diff --git a/test/lib/Dialect/CMakeLists.txt b/test/lib/Dialect/CMakeLists.txt deleted file mode 100644 index 87b979cd5b30..000000000000 --- a/test/lib/Dialect/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(VectorExt) diff --git a/third_party/iree b/third_party/iree deleted file mode 160000 index 853dd6ead922..000000000000 --- a/third_party/iree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 853dd6ead922cc0115beddc3d74b88af8b437172 diff --git a/.github/workflows/buildAndTestIreeDialects.yml b/trunk/.github/workflows/buildAndTestIreeDialects.yml similarity index 100% rename from .github/workflows/buildAndTestIreeDialects.yml rename to trunk/.github/workflows/buildAndTestIreeDialects.yml diff --git a/.github/workflows/testSQLDialect.yml b/trunk/.github/workflows/testSQLDialect.yml similarity index 100% rename from .github/workflows/testSQLDialect.yml rename to trunk/.github/workflows/testSQLDialect.yml diff --git a/CMakeLists.txt b/trunk/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to trunk/CMakeLists.txt diff --git a/benchmark.sh b/trunk/benchmark.sh similarity index 100% rename from benchmark.sh rename to trunk/benchmark.sh diff --git a/benchmarks/.gitignore b/trunk/benchmarks/.gitignore similarity index 100% rename from benchmarks/.gitignore rename to trunk/benchmarks/.gitignore diff --git a/benchmarks/bandwidth_bound_l1.sh b/trunk/benchmarks/bandwidth_bound_l1.sh similarity index 100% rename from benchmarks/bandwidth_bound_l1.sh rename to trunk/benchmarks/bandwidth_bound_l1.sh diff --git a/benchmarks/bandwidth_bound_l2.sh b/trunk/benchmarks/bandwidth_bound_l2.sh similarity index 100% rename from benchmarks/bandwidth_bound_l2.sh rename to trunk/benchmarks/bandwidth_bound_l2.sh diff --git a/benchmarks/bandwidth_bound_l3.sh b/trunk/benchmarks/bandwidth_bound_l3.sh similarity index 100% rename from benchmarks/bandwidth_bound_l3.sh rename to trunk/benchmarks/bandwidth_bound_l3.sh diff --git a/benchmarks/conv.sh b/trunk/benchmarks/conv.sh similarity index 100% rename from benchmarks/conv.sh rename to trunk/benchmarks/conv.sh diff --git a/benchmarks/depthwise_conv.sh b/trunk/benchmarks/depthwise_conv.sh similarity index 100% rename from benchmarks/depthwise_conv.sh rename to trunk/benchmarks/depthwise_conv.sh diff --git a/benchmarks/matmul.sh b/trunk/benchmarks/matmul.sh similarity index 100% rename from benchmarks/matmul.sh rename to trunk/benchmarks/matmul.sh diff --git a/configure.py b/trunk/configure.py similarity index 100% rename from configure.py rename to trunk/configure.py diff --git a/experimental/CMakeLists.txt b/trunk/experimental/CMakeLists.txt similarity index 100% rename from experimental/CMakeLists.txt rename to trunk/experimental/CMakeLists.txt diff --git a/experimental/alp/CMakeLists.txt b/trunk/experimental/alp/CMakeLists.txt similarity index 100% rename from experimental/alp/CMakeLists.txt rename to trunk/experimental/alp/CMakeLists.txt diff --git a/experimental/alp/README.md b/trunk/experimental/alp/README.md similarity index 100% rename from experimental/alp/README.md rename to trunk/experimental/alp/README.md diff --git a/experimental/alp/alp/compile_op.py b/trunk/experimental/alp/alp/compile_op.py similarity index 100% rename from experimental/alp/alp/compile_op.py rename to trunk/experimental/alp/alp/compile_op.py diff --git a/experimental/alp/include/CMakeLists.txt b/trunk/experimental/alp/include/CMakeLists.txt similarity index 100% rename from experimental/alp/include/CMakeLists.txt rename to trunk/experimental/alp/include/CMakeLists.txt diff --git a/experimental/alp/include/alp/CMakeLists.txt b/trunk/experimental/alp/include/alp/CMakeLists.txt similarity index 100% rename from experimental/alp/include/alp/CMakeLists.txt rename to trunk/experimental/alp/include/alp/CMakeLists.txt diff --git a/experimental/alp/include/alp/Transforms/CMakeLists.txt b/trunk/experimental/alp/include/alp/Transforms/CMakeLists.txt similarity index 100% rename from experimental/alp/include/alp/Transforms/CMakeLists.txt rename to trunk/experimental/alp/include/alp/Transforms/CMakeLists.txt diff --git a/experimental/alp/include/alp/Transforms/PassDetail.h b/trunk/experimental/alp/include/alp/Transforms/PassDetail.h similarity index 100% rename from experimental/alp/include/alp/Transforms/PassDetail.h rename to trunk/experimental/alp/include/alp/Transforms/PassDetail.h diff --git a/experimental/alp/include/alp/Transforms/Passes.h b/trunk/experimental/alp/include/alp/Transforms/Passes.h similarity index 100% rename from experimental/alp/include/alp/Transforms/Passes.h rename to trunk/experimental/alp/include/alp/Transforms/Passes.h diff --git a/experimental/alp/include/alp/Transforms/Passes.td b/trunk/experimental/alp/include/alp/Transforms/Passes.td similarity index 100% rename from experimental/alp/include/alp/Transforms/Passes.td rename to trunk/experimental/alp/include/alp/Transforms/Passes.td diff --git a/experimental/alp/lib/AlpRuntime/alp_runtime.cpp b/trunk/experimental/alp/lib/AlpRuntime/alp_runtime.cpp similarity index 100% rename from experimental/alp/lib/AlpRuntime/alp_runtime.cpp rename to trunk/experimental/alp/lib/AlpRuntime/alp_runtime.cpp diff --git a/experimental/alp/lib/CMakeLists.txt b/trunk/experimental/alp/lib/CMakeLists.txt similarity index 100% rename from experimental/alp/lib/CMakeLists.txt rename to trunk/experimental/alp/lib/CMakeLists.txt diff --git a/experimental/alp/lib/Transforms/CMakeLists.txt b/trunk/experimental/alp/lib/Transforms/CMakeLists.txt similarity index 100% rename from experimental/alp/lib/Transforms/CMakeLists.txt rename to trunk/experimental/alp/lib/Transforms/CMakeLists.txt diff --git a/experimental/alp/lib/Transforms/extract_kernel_pass.cpp b/trunk/experimental/alp/lib/Transforms/extract_kernel_pass.cpp similarity index 100% rename from experimental/alp/lib/Transforms/extract_kernel_pass.cpp rename to trunk/experimental/alp/lib/Transforms/extract_kernel_pass.cpp diff --git a/experimental/alp/lib/Transforms/for_to_dowhile_loop.cpp b/trunk/experimental/alp/lib/Transforms/for_to_dowhile_loop.cpp similarity index 100% rename from experimental/alp/lib/Transforms/for_to_dowhile_loop.cpp rename to trunk/experimental/alp/lib/Transforms/for_to_dowhile_loop.cpp diff --git a/experimental/alp/lib/Transforms/legalize_vector.cpp b/trunk/experimental/alp/lib/Transforms/legalize_vector.cpp similarity index 100% rename from experimental/alp/lib/Transforms/legalize_vector.cpp rename to trunk/experimental/alp/lib/Transforms/legalize_vector.cpp diff --git a/experimental/alp/lib/Transforms/modulo_scheduling_pass.cpp b/trunk/experimental/alp/lib/Transforms/modulo_scheduling_pass.cpp similarity index 100% rename from experimental/alp/lib/Transforms/modulo_scheduling_pass.cpp rename to trunk/experimental/alp/lib/Transforms/modulo_scheduling_pass.cpp diff --git a/experimental/alp/python/alp/__init__.py b/trunk/experimental/alp/python/alp/__init__.py similarity index 100% rename from experimental/alp/python/alp/__init__.py rename to trunk/experimental/alp/python/alp/__init__.py diff --git a/experimental/alp/python/alp/backend/__init__.py b/trunk/experimental/alp/python/alp/backend/__init__.py similarity index 100% rename from experimental/alp/python/alp/backend/__init__.py rename to trunk/experimental/alp/python/alp/backend/__init__.py diff --git a/experimental/alp/python/alp/backend/codegen.py b/trunk/experimental/alp/python/alp/backend/codegen.py similarity index 100% rename from experimental/alp/python/alp/backend/codegen.py rename to trunk/experimental/alp/python/alp/backend/codegen.py diff --git a/experimental/alp/python/alp/backend/mlirc.py b/trunk/experimental/alp/python/alp/backend/mlirc.py similarity index 100% rename from experimental/alp/python/alp/backend/mlirc.py rename to trunk/experimental/alp/python/alp/backend/mlirc.py diff --git a/experimental/alp/python/alp/backend/transforms.py b/trunk/experimental/alp/python/alp/backend/transforms.py similarity index 100% rename from experimental/alp/python/alp/backend/transforms.py rename to trunk/experimental/alp/python/alp/backend/transforms.py diff --git a/experimental/alp/python/alp/backend/tuner.py b/trunk/experimental/alp/python/alp/backend/tuner.py similarity index 100% rename from experimental/alp/python/alp/backend/tuner.py rename to trunk/experimental/alp/python/alp/backend/tuner.py diff --git a/experimental/alp/python/alp/backend/utils.py b/trunk/experimental/alp/python/alp/backend/utils.py similarity index 100% rename from experimental/alp/python/alp/backend/utils.py rename to trunk/experimental/alp/python/alp/backend/utils.py diff --git a/experimental/alp/python/alp/benchmark/__init__.py b/trunk/experimental/alp/python/alp/benchmark/__init__.py similarity index 100% rename from experimental/alp/python/alp/benchmark/__init__.py rename to trunk/experimental/alp/python/alp/benchmark/__init__.py diff --git a/experimental/alp/python/alp/benchmark/blas/__init__.py b/trunk/experimental/alp/python/alp/benchmark/blas/__init__.py similarity index 100% rename from experimental/alp/python/alp/benchmark/blas/__init__.py rename to trunk/experimental/alp/python/alp/benchmark/blas/__init__.py diff --git a/experimental/alp/python/alp/benchmark/blas/gemm.py b/trunk/experimental/alp/python/alp/benchmark/blas/gemm.py similarity index 100% rename from experimental/alp/python/alp/benchmark/blas/gemm.py rename to trunk/experimental/alp/python/alp/benchmark/blas/gemm.py diff --git a/experimental/alp/python/alp/benchmark/infra.py b/trunk/experimental/alp/python/alp/benchmark/infra.py similarity index 100% rename from experimental/alp/python/alp/benchmark/infra.py rename to trunk/experimental/alp/python/alp/benchmark/infra.py diff --git a/experimental/alp/python/alp/test/__init__.py b/trunk/experimental/alp/python/alp/test/__init__.py similarity index 100% rename from experimental/alp/python/alp/test/__init__.py rename to trunk/experimental/alp/python/alp/test/__init__.py diff --git a/experimental/alp/python/alp/test/blas/__init__.py b/trunk/experimental/alp/python/alp/test/blas/__init__.py similarity index 100% rename from experimental/alp/python/alp/test/blas/__init__.py rename to trunk/experimental/alp/python/alp/test/blas/__init__.py diff --git a/experimental/alp/python/alp/test/blas/gemm.py b/trunk/experimental/alp/python/alp/test/blas/gemm.py similarity index 100% rename from experimental/alp/python/alp/test/blas/gemm.py rename to trunk/experimental/alp/python/alp/test/blas/gemm.py diff --git a/experimental/alp/python/alp/test/infra.py b/trunk/experimental/alp/python/alp/test/infra.py similarity index 100% rename from experimental/alp/python/alp/test/infra.py rename to trunk/experimental/alp/python/alp/test/infra.py diff --git a/experimental/alp/python/alp/transition/__init__.py b/trunk/experimental/alp/python/alp/transition/__init__.py similarity index 100% rename from experimental/alp/python/alp/transition/__init__.py rename to trunk/experimental/alp/python/alp/transition/__init__.py diff --git a/experimental/alp/python/alp/transition/blas/__init__.py b/trunk/experimental/alp/python/alp/transition/blas/__init__.py similarity index 100% rename from experimental/alp/python/alp/transition/blas/__init__.py rename to trunk/experimental/alp/python/alp/transition/blas/__init__.py diff --git a/experimental/alp/python/alp/transition/blas/gemm.py b/trunk/experimental/alp/python/alp/transition/blas/gemm.py similarity index 100% rename from experimental/alp/python/alp/transition/blas/gemm.py rename to trunk/experimental/alp/python/alp/transition/blas/gemm.py diff --git a/experimental/alp/python/test/gemm.py b/trunk/experimental/alp/python/test/gemm.py similarity index 100% rename from experimental/alp/python/test/gemm.py rename to trunk/experimental/alp/python/test/gemm.py diff --git a/experimental/alp/test/test-alp-legalize.mlir b/trunk/experimental/alp/test/test-alp-legalize.mlir similarity index 100% rename from experimental/alp/test/test-alp-legalize.mlir rename to trunk/experimental/alp/test/test-alp-legalize.mlir diff --git a/experimental/alp/test/test-alp-modulo-scheduling.mlir b/trunk/experimental/alp/test/test-alp-modulo-scheduling.mlir similarity index 100% rename from experimental/alp/test/test-alp-modulo-scheduling.mlir rename to trunk/experimental/alp/test/test-alp-modulo-scheduling.mlir diff --git a/experimental/sql/.style.yapf b/trunk/experimental/sql/.style.yapf similarity index 100% rename from experimental/sql/.style.yapf rename to trunk/experimental/sql/.style.yapf diff --git a/experimental/sql/README.md b/trunk/experimental/sql/README.md similarity index 100% rename from experimental/sql/README.md rename to trunk/experimental/sql/README.md diff --git a/experimental/sql/dialects/ibis_dialect.py b/trunk/experimental/sql/dialects/ibis_dialect.py similarity index 100% rename from experimental/sql/dialects/ibis_dialect.py rename to trunk/experimental/sql/dialects/ibis_dialect.py diff --git a/experimental/sql/dialects/iterators.py b/trunk/experimental/sql/dialects/iterators.py similarity index 100% rename from experimental/sql/dialects/iterators.py rename to trunk/experimental/sql/dialects/iterators.py diff --git a/experimental/sql/dialects/rel_alg.py b/trunk/experimental/sql/dialects/rel_alg.py similarity index 100% rename from experimental/sql/dialects/rel_alg.py rename to trunk/experimental/sql/dialects/rel_alg.py diff --git a/experimental/sql/dialects/rel_impl.py b/trunk/experimental/sql/dialects/rel_impl.py similarity index 100% rename from experimental/sql/dialects/rel_impl.py rename to trunk/experimental/sql/dialects/rel_impl.py diff --git a/experimental/sql/dialects/rel_ssa.py b/trunk/experimental/sql/dialects/rel_ssa.py similarity index 100% rename from experimental/sql/dialects/rel_ssa.py rename to trunk/experimental/sql/dialects/rel_ssa.py diff --git a/experimental/sql/requirements.txt b/trunk/experimental/sql/requirements.txt similarity index 100% rename from experimental/sql/requirements.txt rename to trunk/experimental/sql/requirements.txt diff --git a/experimental/sql/src/alg_to_ssa.py b/trunk/experimental/sql/src/alg_to_ssa.py similarity index 100% rename from experimental/sql/src/alg_to_ssa.py rename to trunk/experimental/sql/src/alg_to_ssa.py diff --git a/experimental/sql/src/fuse_proj_into_scan.py b/trunk/experimental/sql/src/fuse_proj_into_scan.py similarity index 100% rename from experimental/sql/src/fuse_proj_into_scan.py rename to trunk/experimental/sql/src/fuse_proj_into_scan.py diff --git a/experimental/sql/src/ibis_frontend.py b/trunk/experimental/sql/src/ibis_frontend.py similarity index 100% rename from experimental/sql/src/ibis_frontend.py rename to trunk/experimental/sql/src/ibis_frontend.py diff --git a/experimental/sql/src/ibis_to_alg.py b/trunk/experimental/sql/src/ibis_to_alg.py similarity index 100% rename from experimental/sql/src/ibis_to_alg.py rename to trunk/experimental/sql/src/ibis_to_alg.py diff --git a/experimental/sql/src/impl_to_iterators.py b/trunk/experimental/sql/src/impl_to_iterators.py similarity index 100% rename from experimental/sql/src/impl_to_iterators.py rename to trunk/experimental/sql/src/impl_to_iterators.py diff --git a/experimental/sql/src/projection_pushdown.py b/trunk/experimental/sql/src/projection_pushdown.py similarity index 100% rename from experimental/sql/src/projection_pushdown.py rename to trunk/experimental/sql/src/projection_pushdown.py diff --git a/experimental/sql/src/ssa_to_impl.py b/trunk/experimental/sql/src/ssa_to_impl.py similarity index 100% rename from experimental/sql/src/ssa_to_impl.py rename to trunk/experimental/sql/src/ssa_to_impl.py diff --git a/experimental/sql/test/alg_to_ssa/cartesian.xdsl b/trunk/experimental/sql/test/alg_to_ssa/cartesian.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/cartesian.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/cartesian.xdsl diff --git a/experimental/sql/test/alg_to_ssa/count.xdsl b/trunk/experimental/sql/test/alg_to_ssa/count.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/count.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/count.xdsl diff --git a/experimental/sql/test/alg_to_ssa/count_column.xdsl b/trunk/experimental/sql/test/alg_to_ssa/count_column.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/count_column.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/count_column.xdsl diff --git a/experimental/sql/test/alg_to_ssa/datatypes.xdsl b/trunk/experimental/sql/test/alg_to_ssa/datatypes.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/datatypes.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/datatypes.xdsl diff --git a/experimental/sql/test/alg_to_ssa/group_by.xdsl b/trunk/experimental/sql/test/alg_to_ssa/group_by.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/group_by.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/group_by.xdsl diff --git a/experimental/sql/test/alg_to_ssa/limit.xdsl b/trunk/experimental/sql/test/alg_to_ssa/limit.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/limit.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/limit.xdsl diff --git a/experimental/sql/test/alg_to_ssa/multi_cond.xdsl b/trunk/experimental/sql/test/alg_to_ssa/multi_cond.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/multi_cond.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/multi_cond.xdsl diff --git a/experimental/sql/test/alg_to_ssa/multiply.xdsl b/trunk/experimental/sql/test/alg_to_ssa/multiply.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/multiply.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/multiply.xdsl diff --git a/experimental/sql/test/alg_to_ssa/nesting_error.xdsl b/trunk/experimental/sql/test/alg_to_ssa/nesting_error.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/nesting_error.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/nesting_error.xdsl diff --git a/experimental/sql/test/alg_to_ssa/order_by.xdsl b/trunk/experimental/sql/test/alg_to_ssa/order_by.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/order_by.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/order_by.xdsl diff --git a/experimental/sql/test/alg_to_ssa/project_type_fix.xdsl b/trunk/experimental/sql/test/alg_to_ssa/project_type_fix.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/project_type_fix.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/project_type_fix.xdsl diff --git a/experimental/sql/test/alg_to_ssa/projection.xdsl b/trunk/experimental/sql/test/alg_to_ssa/projection.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/projection.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/projection.xdsl diff --git a/experimental/sql/test/alg_to_ssa/selection_op.xdsl b/trunk/experimental/sql/test/alg_to_ssa/selection_op.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/selection_op.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/selection_op.xdsl diff --git a/experimental/sql/test/alg_to_ssa/sum.xdsl b/trunk/experimental/sql/test/alg_to_ssa/sum.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/sum.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/sum.xdsl diff --git a/experimental/sql/test/alg_to_ssa/table_op.xdsl b/trunk/experimental/sql/test/alg_to_ssa/table_op.xdsl similarity index 100% rename from experimental/sql/test/alg_to_ssa/table_op.xdsl rename to trunk/experimental/sql/test/alg_to_ssa/table_op.xdsl diff --git a/experimental/sql/test/frontend/LessEqual.ibis b/trunk/experimental/sql/test/frontend/LessEqual.ibis similarity index 100% rename from experimental/sql/test/frontend/LessEqual.ibis rename to trunk/experimental/sql/test/frontend/LessEqual.ibis diff --git a/experimental/sql/test/frontend/LessThan.ibis b/trunk/experimental/sql/test/frontend/LessThan.ibis similarity index 100% rename from experimental/sql/test/frontend/LessThan.ibis rename to trunk/experimental/sql/test/frontend/LessThan.ibis diff --git a/experimental/sql/test/frontend/add.ibis b/trunk/experimental/sql/test/frontend/add.ibis similarity index 100% rename from experimental/sql/test/frontend/add.ibis rename to trunk/experimental/sql/test/frontend/add.ibis diff --git a/experimental/sql/test/frontend/and.ibis b/trunk/experimental/sql/test/frontend/and.ibis similarity index 100% rename from experimental/sql/test/frontend/and.ibis rename to trunk/experimental/sql/test/frontend/and.ibis diff --git a/experimental/sql/test/frontend/between.ibis b/trunk/experimental/sql/test/frontend/between.ibis similarity index 100% rename from experimental/sql/test/frontend/between.ibis rename to trunk/experimental/sql/test/frontend/between.ibis diff --git a/experimental/sql/test/frontend/cartesian.ibis b/trunk/experimental/sql/test/frontend/cartesian.ibis similarity index 100% rename from experimental/sql/test/frontend/cartesian.ibis rename to trunk/experimental/sql/test/frontend/cartesian.ibis diff --git a/experimental/sql/test/frontend/count.ibis b/trunk/experimental/sql/test/frontend/count.ibis similarity index 100% rename from experimental/sql/test/frontend/count.ibis rename to trunk/experimental/sql/test/frontend/count.ibis diff --git a/experimental/sql/test/frontend/count_column.ibis b/trunk/experimental/sql/test/frontend/count_column.ibis similarity index 100% rename from experimental/sql/test/frontend/count_column.ibis rename to trunk/experimental/sql/test/frontend/count_column.ibis diff --git a/experimental/sql/test/frontend/count_distinct.ibis b/trunk/experimental/sql/test/frontend/count_distinct.ibis similarity index 100% rename from experimental/sql/test/frontend/count_distinct.ibis rename to trunk/experimental/sql/test/frontend/count_distinct.ibis diff --git a/experimental/sql/test/frontend/dataTypes.ibis b/trunk/experimental/sql/test/frontend/dataTypes.ibis similarity index 100% rename from experimental/sql/test/frontend/dataTypes.ibis rename to trunk/experimental/sql/test/frontend/dataTypes.ibis diff --git a/experimental/sql/test/frontend/decimal_literal.ibis b/trunk/experimental/sql/test/frontend/decimal_literal.ibis similarity index 100% rename from experimental/sql/test/frontend/decimal_literal.ibis rename to trunk/experimental/sql/test/frontend/decimal_literal.ibis diff --git a/experimental/sql/test/frontend/divide.ibis b/trunk/experimental/sql/test/frontend/divide.ibis similarity index 100% rename from experimental/sql/test/frontend/divide.ibis rename to trunk/experimental/sql/test/frontend/divide.ibis diff --git a/experimental/sql/test/frontend/greaterEqual.ibis b/trunk/experimental/sql/test/frontend/greaterEqual.ibis similarity index 100% rename from experimental/sql/test/frontend/greaterEqual.ibis rename to trunk/experimental/sql/test/frontend/greaterEqual.ibis diff --git a/experimental/sql/test/frontend/greaterThan.ibis b/trunk/experimental/sql/test/frontend/greaterThan.ibis similarity index 100% rename from experimental/sql/test/frontend/greaterThan.ibis rename to trunk/experimental/sql/test/frontend/greaterThan.ibis diff --git a/experimental/sql/test/frontend/group_by.ibis b/trunk/experimental/sql/test/frontend/group_by.ibis similarity index 100% rename from experimental/sql/test/frontend/group_by.ibis rename to trunk/experimental/sql/test/frontend/group_by.ibis diff --git a/experimental/sql/test/frontend/join.ibis b/trunk/experimental/sql/test/frontend/join.ibis similarity index 100% rename from experimental/sql/test/frontend/join.ibis rename to trunk/experimental/sql/test/frontend/join.ibis diff --git a/experimental/sql/test/frontend/limit.ibis b/trunk/experimental/sql/test/frontend/limit.ibis similarity index 100% rename from experimental/sql/test/frontend/limit.ibis rename to trunk/experimental/sql/test/frontend/limit.ibis diff --git a/experimental/sql/test/frontend/max.ibis b/trunk/experimental/sql/test/frontend/max.ibis similarity index 100% rename from experimental/sql/test/frontend/max.ibis rename to trunk/experimental/sql/test/frontend/max.ibis diff --git a/experimental/sql/test/frontend/mean.ibis b/trunk/experimental/sql/test/frontend/mean.ibis similarity index 100% rename from experimental/sql/test/frontend/mean.ibis rename to trunk/experimental/sql/test/frontend/mean.ibis diff --git a/experimental/sql/test/frontend/min.ibis b/trunk/experimental/sql/test/frontend/min.ibis similarity index 100% rename from experimental/sql/test/frontend/min.ibis rename to trunk/experimental/sql/test/frontend/min.ibis diff --git a/experimental/sql/test/frontend/multiply.ibis b/trunk/experimental/sql/test/frontend/multiply.ibis similarity index 100% rename from experimental/sql/test/frontend/multiply.ibis rename to trunk/experimental/sql/test/frontend/multiply.ibis diff --git a/experimental/sql/test/frontend/naming.ibis b/trunk/experimental/sql/test/frontend/naming.ibis similarity index 100% rename from experimental/sql/test/frontend/naming.ibis rename to trunk/experimental/sql/test/frontend/naming.ibis diff --git a/experimental/sql/test/frontend/order_by.ibis b/trunk/experimental/sql/test/frontend/order_by.ibis similarity index 100% rename from experimental/sql/test/frontend/order_by.ibis rename to trunk/experimental/sql/test/frontend/order_by.ibis diff --git a/experimental/sql/test/frontend/projection.ibis b/trunk/experimental/sql/test/frontend/projection.ibis similarity index 100% rename from experimental/sql/test/frontend/projection.ibis rename to trunk/experimental/sql/test/frontend/projection.ibis diff --git a/experimental/sql/test/frontend/selection.ibis b/trunk/experimental/sql/test/frontend/selection.ibis similarity index 100% rename from experimental/sql/test/frontend/selection.ibis rename to trunk/experimental/sql/test/frontend/selection.ibis diff --git a/experimental/sql/test/frontend/subtract.ibis b/trunk/experimental/sql/test/frontend/subtract.ibis similarity index 100% rename from experimental/sql/test/frontend/subtract.ibis rename to trunk/experimental/sql/test/frontend/subtract.ibis diff --git a/experimental/sql/test/frontend/sum.ibis b/trunk/experimental/sql/test/frontend/sum.ibis similarity index 100% rename from experimental/sql/test/frontend/sum.ibis rename to trunk/experimental/sql/test/frontend/sum.ibis diff --git a/experimental/sql/test/frontend/var_def.ibis b/trunk/experimental/sql/test/frontend/var_def.ibis similarity index 100% rename from experimental/sql/test/frontend/var_def.ibis rename to trunk/experimental/sql/test/frontend/var_def.ibis diff --git a/experimental/sql/test/fuse_proj_into_scan_tests/complex_projection.xdsl b/trunk/experimental/sql/test/fuse_proj_into_scan_tests/complex_projection.xdsl similarity index 100% rename from experimental/sql/test/fuse_proj_into_scan_tests/complex_projection.xdsl rename to trunk/experimental/sql/test/fuse_proj_into_scan_tests/complex_projection.xdsl diff --git a/experimental/sql/test/fuse_proj_into_scan_tests/extended_case.xdsl b/trunk/experimental/sql/test/fuse_proj_into_scan_tests/extended_case.xdsl similarity index 100% rename from experimental/sql/test/fuse_proj_into_scan_tests/extended_case.xdsl rename to trunk/experimental/sql/test/fuse_proj_into_scan_tests/extended_case.xdsl diff --git a/experimental/sql/test/fuse_proj_into_scan_tests/simple_case.xdsl b/trunk/experimental/sql/test/fuse_proj_into_scan_tests/simple_case.xdsl similarity index 100% rename from experimental/sql/test/fuse_proj_into_scan_tests/simple_case.xdsl rename to trunk/experimental/sql/test/fuse_proj_into_scan_tests/simple_case.xdsl diff --git a/experimental/sql/test/ibis_dialect_tests/multiply.xdsl b/trunk/experimental/sql/test/ibis_dialect_tests/multiply.xdsl similarity index 100% rename from experimental/sql/test/ibis_dialect_tests/multiply.xdsl rename to trunk/experimental/sql/test/ibis_dialect_tests/multiply.xdsl diff --git a/experimental/sql/test/ibis_dialect_tests/projection.xdsl b/trunk/experimental/sql/test/ibis_dialect_tests/projection.xdsl similarity index 100% rename from experimental/sql/test/ibis_dialect_tests/projection.xdsl rename to trunk/experimental/sql/test/ibis_dialect_tests/projection.xdsl diff --git a/experimental/sql/test/ibis_dialect_tests/selection.xdsl b/trunk/experimental/sql/test/ibis_dialect_tests/selection.xdsl similarity index 100% rename from experimental/sql/test/ibis_dialect_tests/selection.xdsl rename to trunk/experimental/sql/test/ibis_dialect_tests/selection.xdsl diff --git a/experimental/sql/test/ibis_dialect_tests/sum.xdsl b/trunk/experimental/sql/test/ibis_dialect_tests/sum.xdsl similarity index 100% rename from experimental/sql/test/ibis_dialect_tests/sum.xdsl rename to trunk/experimental/sql/test/ibis_dialect_tests/sum.xdsl diff --git a/experimental/sql/test/ibis_to_alg/LessEqual.xdsl b/trunk/experimental/sql/test/ibis_to_alg/LessEqual.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/LessEqual.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/LessEqual.xdsl diff --git a/experimental/sql/test/ibis_to_alg/add.xdsl b/trunk/experimental/sql/test/ibis_to_alg/add.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/add.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/add.xdsl diff --git a/experimental/sql/test/ibis_to_alg/between.xdsl b/trunk/experimental/sql/test/ibis_to_alg/between.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/between.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/between.xdsl diff --git a/experimental/sql/test/ibis_to_alg/cartesian.xdsl b/trunk/experimental/sql/test/ibis_to_alg/cartesian.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/cartesian.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/cartesian.xdsl diff --git a/experimental/sql/test/ibis_to_alg/count.xdsl b/trunk/experimental/sql/test/ibis_to_alg/count.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/count.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/count.xdsl diff --git a/experimental/sql/test/ibis_to_alg/count_column.xdsl b/trunk/experimental/sql/test/ibis_to_alg/count_column.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/count_column.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/count_column.xdsl diff --git a/experimental/sql/test/ibis_to_alg/count_distinct.xdsl b/trunk/experimental/sql/test/ibis_to_alg/count_distinct.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/count_distinct.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/count_distinct.xdsl diff --git a/experimental/sql/test/ibis_to_alg/datatypes.xdsl b/trunk/experimental/sql/test/ibis_to_alg/datatypes.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/datatypes.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/datatypes.xdsl diff --git a/experimental/sql/test/ibis_to_alg/divide.xdsl b/trunk/experimental/sql/test/ibis_to_alg/divide.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/divide.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/divide.xdsl diff --git a/experimental/sql/test/ibis_to_alg/equals.xdsl b/trunk/experimental/sql/test/ibis_to_alg/equals.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/equals.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/equals.xdsl diff --git a/experimental/sql/test/ibis_to_alg/greaterEqual.xdsl b/trunk/experimental/sql/test/ibis_to_alg/greaterEqual.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/greaterEqual.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/greaterEqual.xdsl diff --git a/experimental/sql/test/ibis_to_alg/greaterThan.xdsl b/trunk/experimental/sql/test/ibis_to_alg/greaterThan.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/greaterThan.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/greaterThan.xdsl diff --git a/experimental/sql/test/ibis_to_alg/group_by.xdsl b/trunk/experimental/sql/test/ibis_to_alg/group_by.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/group_by.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/group_by.xdsl diff --git a/experimental/sql/test/ibis_to_alg/lessThan.xdsl b/trunk/experimental/sql/test/ibis_to_alg/lessThan.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/lessThan.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/lessThan.xdsl diff --git a/experimental/sql/test/ibis_to_alg/limit.xdsl b/trunk/experimental/sql/test/ibis_to_alg/limit.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/limit.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/limit.xdsl diff --git a/experimental/sql/test/ibis_to_alg/max.xdsl b/trunk/experimental/sql/test/ibis_to_alg/max.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/max.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/max.xdsl diff --git a/experimental/sql/test/ibis_to_alg/mean.xdsl b/trunk/experimental/sql/test/ibis_to_alg/mean.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/mean.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/mean.xdsl diff --git a/experimental/sql/test/ibis_to_alg/min.xdsl b/trunk/experimental/sql/test/ibis_to_alg/min.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/min.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/min.xdsl diff --git a/experimental/sql/test/ibis_to_alg/multiply.xdsl b/trunk/experimental/sql/test/ibis_to_alg/multiply.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/multiply.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/multiply.xdsl diff --git a/experimental/sql/test/ibis_to_alg/order_by.xdsl b/trunk/experimental/sql/test/ibis_to_alg/order_by.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/order_by.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/order_by.xdsl diff --git a/experimental/sql/test/ibis_to_alg/projection.xdsl b/trunk/experimental/sql/test/ibis_to_alg/projection.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/projection.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/projection.xdsl diff --git a/experimental/sql/test/ibis_to_alg/selection_op.xdsl b/trunk/experimental/sql/test/ibis_to_alg/selection_op.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/selection_op.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/selection_op.xdsl diff --git a/experimental/sql/test/ibis_to_alg/subtract.xdsl b/trunk/experimental/sql/test/ibis_to_alg/subtract.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/subtract.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/subtract.xdsl diff --git a/experimental/sql/test/ibis_to_alg/sum.xdsl b/trunk/experimental/sql/test/ibis_to_alg/sum.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/sum.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/sum.xdsl diff --git a/experimental/sql/test/ibis_to_alg/table_op.xdsl b/trunk/experimental/sql/test/ibis_to_alg/table_op.xdsl similarity index 100% rename from experimental/sql/test/ibis_to_alg/table_op.xdsl rename to trunk/experimental/sql/test/ibis_to_alg/table_op.xdsl diff --git a/experimental/sql/test/impl_to_iterators/decimal.xdsl b/trunk/experimental/sql/test/impl_to_iterators/decimal.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/decimal.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/decimal.xdsl diff --git a/experimental/sql/test/impl_to_iterators/filter.xdsl b/trunk/experimental/sql/test/impl_to_iterators/filter.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/filter.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/filter.xdsl diff --git a/experimental/sql/test/impl_to_iterators/filter_and.xdsl b/trunk/experimental/sql/test/impl_to_iterators/filter_and.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/filter_and.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/filter_and.xdsl diff --git a/experimental/sql/test/impl_to_iterators/map.xdsl b/trunk/experimental/sql/test/impl_to_iterators/map.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/map.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/map.xdsl diff --git a/experimental/sql/test/impl_to_iterators/map_mul.xdsl b/trunk/experimental/sql/test/impl_to_iterators/map_mul.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/map_mul.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/map_mul.xdsl diff --git a/experimental/sql/test/impl_to_iterators/map_sub.xdsl b/trunk/experimental/sql/test/impl_to_iterators/map_sub.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/map_sub.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/map_sub.xdsl diff --git a/experimental/sql/test/impl_to_iterators/partial_scan.xdsl b/trunk/experimental/sql/test/impl_to_iterators/partial_scan.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/partial_scan.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/partial_scan.xdsl diff --git a/experimental/sql/test/impl_to_iterators/sum.xdsl b/trunk/experimental/sql/test/impl_to_iterators/sum.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/sum.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/sum.xdsl diff --git a/experimental/sql/test/impl_to_iterators/timestamp.xdsl b/trunk/experimental/sql/test/impl_to_iterators/timestamp.xdsl similarity index 100% rename from experimental/sql/test/impl_to_iterators/timestamp.xdsl rename to trunk/experimental/sql/test/impl_to_iterators/timestamp.xdsl diff --git a/experimental/sql/test/iterators_dialect_tests/filter.xdsl b/trunk/experimental/sql/test/iterators_dialect_tests/filter.xdsl similarity index 100% rename from experimental/sql/test/iterators_dialect_tests/filter.xdsl rename to trunk/experimental/sql/test/iterators_dialect_tests/filter.xdsl diff --git a/experimental/sql/test/iterators_dialect_tests/map.xdsl b/trunk/experimental/sql/test/iterators_dialect_tests/map.xdsl similarity index 100% rename from experimental/sql/test/iterators_dialect_tests/map.xdsl rename to trunk/experimental/sql/test/iterators_dialect_tests/map.xdsl diff --git a/experimental/sql/test/iterators_dialect_tests/simple-plan.xdsl b/trunk/experimental/sql/test/iterators_dialect_tests/simple-plan.xdsl similarity index 100% rename from experimental/sql/test/iterators_dialect_tests/simple-plan.xdsl rename to trunk/experimental/sql/test/iterators_dialect_tests/simple-plan.xdsl diff --git a/experimental/sql/test/lit.cfg b/trunk/experimental/sql/test/lit.cfg similarity index 100% rename from experimental/sql/test/lit.cfg rename to trunk/experimental/sql/test/lit.cfg diff --git a/experimental/sql/test/projection_pushdown_tests/cart_prod.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/cart_prod.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/cart_prod.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/cart_prod.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/cart_prod_extended.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/cart_prod_extended.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/cart_prod_extended.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/cart_prod_extended.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/extended_case.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/extended_case.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/extended_case.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/extended_case.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/grouped_aggregation.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/grouped_aggregation.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/grouped_aggregation.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/grouped_aggregation.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/limit.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/limit.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/limit.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/limit.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/limit_extended.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/limit_extended.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/limit_extended.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/limit_extended.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/multiply.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/multiply.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/multiply.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/multiply.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/order_by.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/order_by.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/order_by.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/order_by.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/order_by_extended.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/order_by_extended.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/order_by_extended.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/order_by_extended.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/rename.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/rename.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/rename.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/rename.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/rename_extended.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/rename_extended.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/rename_extended.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/rename_extended.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/rename_select.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/rename_select.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/rename_select.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/rename_select.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/simple_case.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/simple_case.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/simple_case.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/simple_case.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/sum.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/sum.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/sum.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/sum.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/sum_with_select.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/sum_with_select.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/sum_with_select.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/sum_with_select.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/table_op.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/table_op.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/table_op.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/table_op.xdsl diff --git a/experimental/sql/test/projection_pushdown_tests/useless_project.xdsl b/trunk/experimental/sql/test/projection_pushdown_tests/useless_project.xdsl similarity index 100% rename from experimental/sql/test/projection_pushdown_tests/useless_project.xdsl rename to trunk/experimental/sql/test/projection_pushdown_tests/useless_project.xdsl diff --git a/experimental/sql/test/relational_algebra_dialect_tests/datatypes.xdsl b/trunk/experimental/sql/test/relational_algebra_dialect_tests/datatypes.xdsl similarity index 100% rename from experimental/sql/test/relational_algebra_dialect_tests/datatypes.xdsl rename to trunk/experimental/sql/test/relational_algebra_dialect_tests/datatypes.xdsl diff --git a/experimental/sql/test/relational_algebra_dialect_tests/multiply.xdsl b/trunk/experimental/sql/test/relational_algebra_dialect_tests/multiply.xdsl similarity index 100% rename from experimental/sql/test/relational_algebra_dialect_tests/multiply.xdsl rename to trunk/experimental/sql/test/relational_algebra_dialect_tests/multiply.xdsl diff --git a/experimental/sql/test/relational_algebra_dialect_tests/projection.xdsl b/trunk/experimental/sql/test/relational_algebra_dialect_tests/projection.xdsl similarity index 100% rename from experimental/sql/test/relational_algebra_dialect_tests/projection.xdsl rename to trunk/experimental/sql/test/relational_algebra_dialect_tests/projection.xdsl diff --git a/experimental/sql/test/relational_algebra_dialect_tests/selection_op.xdsl b/trunk/experimental/sql/test/relational_algebra_dialect_tests/selection_op.xdsl similarity index 100% rename from experimental/sql/test/relational_algebra_dialect_tests/selection_op.xdsl rename to trunk/experimental/sql/test/relational_algebra_dialect_tests/selection_op.xdsl diff --git a/experimental/sql/test/relational_algebra_dialect_tests/sum.xdsl b/trunk/experimental/sql/test/relational_algebra_dialect_tests/sum.xdsl similarity index 100% rename from experimental/sql/test/relational_algebra_dialect_tests/sum.xdsl rename to trunk/experimental/sql/test/relational_algebra_dialect_tests/sum.xdsl diff --git a/experimental/sql/test/relational_algebra_dialect_tests/table_op.xdsl b/trunk/experimental/sql/test/relational_algebra_dialect_tests/table_op.xdsl similarity index 100% rename from experimental/sql/test/relational_algebra_dialect_tests/table_op.xdsl rename to trunk/experimental/sql/test/relational_algebra_dialect_tests/table_op.xdsl diff --git a/experimental/sql/test/relational_implementation_dialect_tests/datatypes.xdsl b/trunk/experimental/sql/test/relational_implementation_dialect_tests/datatypes.xdsl similarity index 100% rename from experimental/sql/test/relational_implementation_dialect_tests/datatypes.xdsl rename to trunk/experimental/sql/test/relational_implementation_dialect_tests/datatypes.xdsl diff --git a/experimental/sql/test/relational_implementation_dialect_tests/projection.xdsl b/trunk/experimental/sql/test/relational_implementation_dialect_tests/projection.xdsl similarity index 100% rename from experimental/sql/test/relational_implementation_dialect_tests/projection.xdsl rename to trunk/experimental/sql/test/relational_implementation_dialect_tests/projection.xdsl diff --git a/experimental/sql/test/relational_implementation_dialect_tests/selection_op.xdsl b/trunk/experimental/sql/test/relational_implementation_dialect_tests/selection_op.xdsl similarity index 100% rename from experimental/sql/test/relational_implementation_dialect_tests/selection_op.xdsl rename to trunk/experimental/sql/test/relational_implementation_dialect_tests/selection_op.xdsl diff --git a/experimental/sql/test/relational_implementation_dialect_tests/sum.xdsl b/trunk/experimental/sql/test/relational_implementation_dialect_tests/sum.xdsl similarity index 100% rename from experimental/sql/test/relational_implementation_dialect_tests/sum.xdsl rename to trunk/experimental/sql/test/relational_implementation_dialect_tests/sum.xdsl diff --git a/experimental/sql/test/relational_implementation_dialect_tests/table_op.xdsl b/trunk/experimental/sql/test/relational_implementation_dialect_tests/table_op.xdsl similarity index 100% rename from experimental/sql/test/relational_implementation_dialect_tests/table_op.xdsl rename to trunk/experimental/sql/test/relational_implementation_dialect_tests/table_op.xdsl diff --git a/experimental/sql/test/relational_ssa_dialect_tests/datatypes.xdsl b/trunk/experimental/sql/test/relational_ssa_dialect_tests/datatypes.xdsl similarity index 100% rename from experimental/sql/test/relational_ssa_dialect_tests/datatypes.xdsl rename to trunk/experimental/sql/test/relational_ssa_dialect_tests/datatypes.xdsl diff --git a/experimental/sql/test/relational_ssa_dialect_tests/projection.xdsl b/trunk/experimental/sql/test/relational_ssa_dialect_tests/projection.xdsl similarity index 100% rename from experimental/sql/test/relational_ssa_dialect_tests/projection.xdsl rename to trunk/experimental/sql/test/relational_ssa_dialect_tests/projection.xdsl diff --git a/experimental/sql/test/relational_ssa_dialect_tests/selection_op.xdsl b/trunk/experimental/sql/test/relational_ssa_dialect_tests/selection_op.xdsl similarity index 100% rename from experimental/sql/test/relational_ssa_dialect_tests/selection_op.xdsl rename to trunk/experimental/sql/test/relational_ssa_dialect_tests/selection_op.xdsl diff --git a/experimental/sql/test/relational_ssa_dialect_tests/sum.xdsl b/trunk/experimental/sql/test/relational_ssa_dialect_tests/sum.xdsl similarity index 100% rename from experimental/sql/test/relational_ssa_dialect_tests/sum.xdsl rename to trunk/experimental/sql/test/relational_ssa_dialect_tests/sum.xdsl diff --git a/experimental/sql/test/relational_ssa_dialect_tests/table_op.xdsl b/trunk/experimental/sql/test/relational_ssa_dialect_tests/table_op.xdsl similarity index 100% rename from experimental/sql/test/relational_ssa_dialect_tests/table_op.xdsl rename to trunk/experimental/sql/test/relational_ssa_dialect_tests/table_op.xdsl diff --git a/experimental/sql/test/ssa_to_impl/cartesian.xdsl b/trunk/experimental/sql/test/ssa_to_impl/cartesian.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/cartesian.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/cartesian.xdsl diff --git a/experimental/sql/test/ssa_to_impl/count.xdsl b/trunk/experimental/sql/test/ssa_to_impl/count.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/count.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/count.xdsl diff --git a/experimental/sql/test/ssa_to_impl/count_column.xdsl b/trunk/experimental/sql/test/ssa_to_impl/count_column.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/count_column.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/count_column.xdsl diff --git a/experimental/sql/test/ssa_to_impl/datatypes.xdsl b/trunk/experimental/sql/test/ssa_to_impl/datatypes.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/datatypes.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/datatypes.xdsl diff --git a/experimental/sql/test/ssa_to_impl/group_by.xdsl b/trunk/experimental/sql/test/ssa_to_impl/group_by.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/group_by.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/group_by.xdsl diff --git a/experimental/sql/test/ssa_to_impl/limit.xdsl b/trunk/experimental/sql/test/ssa_to_impl/limit.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/limit.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/limit.xdsl diff --git a/experimental/sql/test/ssa_to_impl/multi_cond.xdsl b/trunk/experimental/sql/test/ssa_to_impl/multi_cond.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/multi_cond.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/multi_cond.xdsl diff --git a/experimental/sql/test/ssa_to_impl/multiply.xdsl b/trunk/experimental/sql/test/ssa_to_impl/multiply.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/multiply.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/multiply.xdsl diff --git a/experimental/sql/test/ssa_to_impl/order_by.xdsl b/trunk/experimental/sql/test/ssa_to_impl/order_by.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/order_by.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/order_by.xdsl diff --git a/experimental/sql/test/ssa_to_impl/projection.xdsl b/trunk/experimental/sql/test/ssa_to_impl/projection.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/projection.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/projection.xdsl diff --git a/experimental/sql/test/ssa_to_impl/selection_op.xdsl b/trunk/experimental/sql/test/ssa_to_impl/selection_op.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/selection_op.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/selection_op.xdsl diff --git a/experimental/sql/test/ssa_to_impl/sum.xdsl b/trunk/experimental/sql/test/ssa_to_impl/sum.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/sum.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/sum.xdsl diff --git a/experimental/sql/test/ssa_to_impl/table_op.xdsl b/trunk/experimental/sql/test/ssa_to_impl/table_op.xdsl similarity index 100% rename from experimental/sql/test/ssa_to_impl/table_op.xdsl rename to trunk/experimental/sql/test/ssa_to_impl/table_op.xdsl diff --git a/experimental/sql/test_mlir/FileCheckVariables/map.xdsl b/trunk/experimental/sql/test_mlir/FileCheckVariables/map.xdsl similarity index 100% rename from experimental/sql/test_mlir/FileCheckVariables/map.xdsl rename to trunk/experimental/sql/test_mlir/FileCheckVariables/map.xdsl diff --git a/experimental/sql/test_mlir/conversion_tests/constant_stream.xdsl b/trunk/experimental/sql/test_mlir/conversion_tests/constant_stream.xdsl similarity index 100% rename from experimental/sql/test_mlir/conversion_tests/constant_stream.xdsl rename to trunk/experimental/sql/test_mlir/conversion_tests/constant_stream.xdsl diff --git a/experimental/sql/test_mlir/conversion_tests/filter.xdsl b/trunk/experimental/sql/test_mlir/conversion_tests/filter.xdsl similarity index 100% rename from experimental/sql/test_mlir/conversion_tests/filter.xdsl rename to trunk/experimental/sql/test_mlir/conversion_tests/filter.xdsl diff --git a/experimental/sql/test_mlir/conversion_tests/map.xdsl b/trunk/experimental/sql/test_mlir/conversion_tests/map.xdsl similarity index 100% rename from experimental/sql/test_mlir/conversion_tests/map.xdsl rename to trunk/experimental/sql/test_mlir/conversion_tests/map.xdsl diff --git a/experimental/sql/test_mlir/conversion_tests/reduce.xdsl b/trunk/experimental/sql/test_mlir/conversion_tests/reduce.xdsl similarity index 100% rename from experimental/sql/test_mlir/conversion_tests/reduce.xdsl rename to trunk/experimental/sql/test_mlir/conversion_tests/reduce.xdsl diff --git a/experimental/sql/test_mlir/conversion_tests/scan_columnar_batch.xdsl b/trunk/experimental/sql/test_mlir/conversion_tests/scan_columnar_batch.xdsl similarity index 100% rename from experimental/sql/test_mlir/conversion_tests/scan_columnar_batch.xdsl rename to trunk/experimental/sql/test_mlir/conversion_tests/scan_columnar_batch.xdsl diff --git a/experimental/sql/test_mlir/lit.cfg b/trunk/experimental/sql/test_mlir/lit.cfg similarity index 100% rename from experimental/sql/test_mlir/lit.cfg rename to trunk/experimental/sql/test_mlir/lit.cfg diff --git a/experimental/sql/tools/IteratorsMLIRConverter.py b/trunk/experimental/sql/tools/IteratorsMLIRConverter.py similarity index 100% rename from experimental/sql/tools/IteratorsMLIRConverter.py rename to trunk/experimental/sql/tools/IteratorsMLIRConverter.py diff --git a/experimental/sql/tools/__init__.py b/trunk/experimental/sql/tools/__init__.py similarity index 100% rename from experimental/sql/tools/__init__.py rename to trunk/experimental/sql/tools/__init__.py diff --git a/experimental/sql/tools/rel_opt.py b/trunk/experimental/sql/tools/rel_opt.py similarity index 100% rename from experimental/sql/tools/rel_opt.py rename to trunk/experimental/sql/tools/rel_opt.py diff --git a/trunk/contraction/definitions.py b/trunk/older-python-benchmarks/contraction/definitions.py similarity index 100% rename from trunk/contraction/definitions.py rename to trunk/older-python-benchmarks/contraction/definitions.py diff --git a/trunk/contraction/einsum.py b/trunk/older-python-benchmarks/contraction/einsum.py similarity index 100% rename from trunk/contraction/einsum.py rename to trunk/older-python-benchmarks/contraction/einsum.py diff --git a/trunk/contraction/einsum_test.py b/trunk/older-python-benchmarks/contraction/einsum_test.py similarity index 100% rename from trunk/contraction/einsum_test.py rename to trunk/older-python-benchmarks/contraction/einsum_test.py diff --git a/trunk/conv/conv_1d_bench.py b/trunk/older-python-benchmarks/conv/conv_1d_bench.py similarity index 100% rename from trunk/conv/conv_1d_bench.py rename to trunk/older-python-benchmarks/conv/conv_1d_bench.py diff --git a/trunk/conv/conv_2d_bench.py b/trunk/older-python-benchmarks/conv/conv_2d_bench.py similarity index 100% rename from trunk/conv/conv_2d_bench.py rename to trunk/older-python-benchmarks/conv/conv_2d_bench.py diff --git a/trunk/conv/conv_3d_bench.py b/trunk/older-python-benchmarks/conv/conv_3d_bench.py similarity index 100% rename from trunk/conv/conv_3d_bench.py rename to trunk/older-python-benchmarks/conv/conv_3d_bench.py diff --git a/trunk/conv/definitions.py b/trunk/older-python-benchmarks/conv/definitions.py similarity index 100% rename from trunk/conv/definitions.py rename to trunk/older-python-benchmarks/conv/definitions.py diff --git a/trunk/conv/ops.py b/trunk/older-python-benchmarks/conv/ops.py similarity index 100% rename from trunk/conv/ops.py rename to trunk/older-python-benchmarks/conv/ops.py diff --git a/trunk/copy/copy_1d_bench.py b/trunk/older-python-benchmarks/copy/copy_1d_bench.py similarity index 100% rename from trunk/copy/copy_1d_bench.py rename to trunk/older-python-benchmarks/copy/copy_1d_bench.py diff --git a/trunk/copy/copy_2d_bench.py b/trunk/older-python-benchmarks/copy/copy_2d_bench.py similarity index 100% rename from trunk/copy/copy_2d_bench.py rename to trunk/older-python-benchmarks/copy/copy_2d_bench.py diff --git a/trunk/copy/custom_copy_2d_bench.py b/trunk/older-python-benchmarks/copy/custom_copy_2d_bench.py similarity index 100% rename from trunk/copy/custom_copy_2d_bench.py rename to trunk/older-python-benchmarks/copy/custom_copy_2d_bench.py diff --git a/trunk/copy/definitions.py b/trunk/older-python-benchmarks/copy/definitions.py similarity index 100% rename from trunk/copy/definitions.py rename to trunk/older-python-benchmarks/copy/definitions.py diff --git a/trunk/depthwise_conv/definitions.py b/trunk/older-python-benchmarks/depthwise_conv/definitions.py similarity index 100% rename from trunk/depthwise_conv/definitions.py rename to trunk/older-python-benchmarks/depthwise_conv/definitions.py diff --git a/trunk/depthwise_conv/depthwise_conv_1d_bench.py b/trunk/older-python-benchmarks/depthwise_conv/depthwise_conv_1d_bench.py similarity index 100% rename from trunk/depthwise_conv/depthwise_conv_1d_bench.py rename to trunk/older-python-benchmarks/depthwise_conv/depthwise_conv_1d_bench.py diff --git a/trunk/depthwise_conv/depthwise_conv_2d_bench.py b/trunk/older-python-benchmarks/depthwise_conv/depthwise_conv_2d_bench.py similarity index 100% rename from trunk/depthwise_conv/depthwise_conv_2d_bench.py rename to trunk/older-python-benchmarks/depthwise_conv/depthwise_conv_2d_bench.py diff --git a/trunk/depthwise_conv/ops.py b/trunk/older-python-benchmarks/depthwise_conv/ops.py similarity index 100% rename from trunk/depthwise_conv/ops.py rename to trunk/older-python-benchmarks/depthwise_conv/ops.py diff --git a/trunk/dialects/linalg_transform_test.py b/trunk/older-python-benchmarks/dialects/linalg_transform_test.py similarity index 100% rename from trunk/dialects/linalg_transform_test.py rename to trunk/older-python-benchmarks/dialects/linalg_transform_test.py diff --git a/trunk/dialects/test.py b/trunk/older-python-benchmarks/dialects/test.py similarity index 100% rename from trunk/dialects/test.py rename to trunk/older-python-benchmarks/dialects/test.py diff --git a/trunk/fusion/definitions.py b/trunk/older-python-benchmarks/fusion/definitions.py similarity index 100% rename from trunk/fusion/definitions.py rename to trunk/older-python-benchmarks/fusion/definitions.py diff --git a/trunk/fusion/test.py b/trunk/older-python-benchmarks/fusion/test.py similarity index 100% rename from trunk/fusion/test.py rename to trunk/older-python-benchmarks/fusion/test.py diff --git a/trunk/iree/README.md b/trunk/older-python-benchmarks/iree/README.md similarity index 100% rename from trunk/iree/README.md rename to trunk/older-python-benchmarks/iree/README.md diff --git a/trunk/iree/simple_matmul.py b/trunk/older-python-benchmarks/iree/simple_matmul.py similarity index 100% rename from trunk/iree/simple_matmul.py rename to trunk/older-python-benchmarks/iree/simple_matmul.py diff --git a/trunk/linalg_ext/in_par_bench.py b/trunk/older-python-benchmarks/linalg_ext/in_par_bench.py similarity index 100% rename from trunk/linalg_ext/in_par_bench.py rename to trunk/older-python-benchmarks/linalg_ext/in_par_bench.py diff --git a/trunk/linalg_ext/test_in_par.py b/trunk/older-python-benchmarks/linalg_ext/test_in_par.py similarity index 100% rename from trunk/linalg_ext/test_in_par.py rename to trunk/older-python-benchmarks/linalg_ext/test_in_par.py diff --git a/trunk/linalg_ext/test_seq.py b/trunk/older-python-benchmarks/linalg_ext/test_seq.py similarity index 100% rename from trunk/linalg_ext/test_seq.py rename to trunk/older-python-benchmarks/linalg_ext/test_seq.py diff --git a/trunk/matmul/bench.py b/trunk/older-python-benchmarks/matmul/bench.py similarity index 100% rename from trunk/matmul/bench.py rename to trunk/older-python-benchmarks/matmul/bench.py diff --git a/trunk/matmul/test.py b/trunk/older-python-benchmarks/matmul/test.py similarity index 100% rename from trunk/matmul/test.py rename to trunk/older-python-benchmarks/matmul/test.py diff --git a/trunk/matmul/test_schedule_dialect.py b/trunk/older-python-benchmarks/matmul/test_schedule_dialect.py similarity index 100% rename from trunk/matmul/test_schedule_dialect.py rename to trunk/older-python-benchmarks/matmul/test_schedule_dialect.py diff --git a/trunk/matvec/bench.py b/trunk/older-python-benchmarks/matvec/bench.py similarity index 100% rename from trunk/matvec/bench.py rename to trunk/older-python-benchmarks/matvec/bench.py diff --git a/trunk/matvec/test.py b/trunk/older-python-benchmarks/matvec/test.py similarity index 100% rename from trunk/matvec/test.py rename to trunk/older-python-benchmarks/matvec/test.py diff --git a/trunk/padding/definitions.py b/trunk/older-python-benchmarks/padding/definitions.py similarity index 100% rename from trunk/padding/definitions.py rename to trunk/older-python-benchmarks/padding/definitions.py diff --git a/trunk/padding/padded_conv1d_bench.py b/trunk/older-python-benchmarks/padding/padded_conv1d_bench.py similarity index 100% rename from trunk/padding/padded_conv1d_bench.py rename to trunk/older-python-benchmarks/padding/padded_conv1d_bench.py diff --git a/trunk/reduction/column_reduction_2d_bench.py b/trunk/older-python-benchmarks/reduction/column_reduction_2d_bench.py similarity index 100% rename from trunk/reduction/column_reduction_2d_bench.py rename to trunk/older-python-benchmarks/reduction/column_reduction_2d_bench.py diff --git a/trunk/reduction/column_reduction_2d_fused_fill_bench.py b/trunk/older-python-benchmarks/reduction/column_reduction_2d_fused_fill_bench.py similarity index 100% rename from trunk/reduction/column_reduction_2d_fused_fill_bench.py rename to trunk/older-python-benchmarks/reduction/column_reduction_2d_fused_fill_bench.py diff --git a/trunk/reduction/column_reduction_2d_test.py b/trunk/older-python-benchmarks/reduction/column_reduction_2d_test.py similarity index 100% rename from trunk/reduction/column_reduction_2d_test.py rename to trunk/older-python-benchmarks/reduction/column_reduction_2d_test.py diff --git a/trunk/reduction/reduction_1d_bench.py b/trunk/older-python-benchmarks/reduction/reduction_1d_bench.py similarity index 100% rename from trunk/reduction/reduction_1d_bench.py rename to trunk/older-python-benchmarks/reduction/reduction_1d_bench.py diff --git a/trunk/reduction/reduction_1d_test.py b/trunk/older-python-benchmarks/reduction/reduction_1d_test.py similarity index 100% rename from trunk/reduction/reduction_1d_test.py rename to trunk/older-python-benchmarks/reduction/reduction_1d_test.py diff --git a/trunk/reduction/row_reduction_2d_bench.py b/trunk/older-python-benchmarks/reduction/row_reduction_2d_bench.py similarity index 100% rename from trunk/reduction/row_reduction_2d_bench.py rename to trunk/older-python-benchmarks/reduction/row_reduction_2d_bench.py diff --git a/trunk/reduction/row_reduction_2d_fused_fill_bench.py b/trunk/older-python-benchmarks/reduction/row_reduction_2d_fused_fill_bench.py similarity index 100% rename from trunk/reduction/row_reduction_2d_fused_fill_bench.py rename to trunk/older-python-benchmarks/reduction/row_reduction_2d_fused_fill_bench.py diff --git a/trunk/reduction/row_reduction_2d_test.py b/trunk/older-python-benchmarks/reduction/row_reduction_2d_test.py similarity index 100% rename from trunk/reduction/row_reduction_2d_test.py rename to trunk/older-python-benchmarks/reduction/row_reduction_2d_test.py diff --git a/trunk/transpose/transpose_2d_bench.py b/trunk/older-python-benchmarks/transpose/transpose_2d_bench.py similarity index 100% rename from trunk/transpose/transpose_2d_bench.py rename to trunk/older-python-benchmarks/transpose/transpose_2d_bench.py diff --git a/trunk/transpose/transpose_4d_bench.py b/trunk/older-python-benchmarks/transpose/transpose_4d_bench.py similarity index 100% rename from trunk/transpose/transpose_4d_bench.py rename to trunk/older-python-benchmarks/transpose/transpose_4d_bench.py diff --git a/trunk/tuning/test_nevergrad_small_matmul.py b/trunk/older-python-benchmarks/tuning/test_nevergrad_small_matmul.py similarity index 100% rename from trunk/tuning/test_nevergrad_small_matmul.py rename to trunk/older-python-benchmarks/tuning/test_nevergrad_small_matmul.py diff --git a/python/CMakeLists.txt b/trunk/python/CMakeLists.txt similarity index 100% rename from python/CMakeLists.txt rename to trunk/python/CMakeLists.txt diff --git a/python/PythonAPI.cpp b/trunk/python/PythonAPI.cpp similarity index 100% rename from python/PythonAPI.cpp rename to trunk/python/PythonAPI.cpp diff --git a/python/mlir/sandbox/compilation.py b/trunk/python/mlir/sandbox/compilation.py similarity index 100% rename from python/mlir/sandbox/compilation.py rename to trunk/python/mlir/sandbox/compilation.py diff --git a/python/mlir/sandbox/experts.py b/trunk/python/mlir/sandbox/experts.py similarity index 100% rename from python/mlir/sandbox/experts.py rename to trunk/python/mlir/sandbox/experts.py diff --git a/python/mlir/sandbox/harness.py b/trunk/python/mlir/sandbox/harness.py similarity index 100% rename from python/mlir/sandbox/harness.py rename to trunk/python/mlir/sandbox/harness.py diff --git a/python/mlir/sandbox/iree_sandbox.py b/trunk/python/mlir/sandbox/iree_sandbox.py similarity index 100% rename from python/mlir/sandbox/iree_sandbox.py rename to trunk/python/mlir/sandbox/iree_sandbox.py diff --git a/python/mlir/sandbox/nevergrad_parallel_utils.py b/trunk/python/mlir/sandbox/nevergrad_parallel_utils.py similarity index 100% rename from python/mlir/sandbox/nevergrad_parallel_utils.py rename to trunk/python/mlir/sandbox/nevergrad_parallel_utils.py diff --git a/python/mlir/sandbox/nevergrad_searchable_strategies.py b/trunk/python/mlir/sandbox/nevergrad_searchable_strategies.py similarity index 100% rename from python/mlir/sandbox/nevergrad_searchable_strategies.py rename to trunk/python/mlir/sandbox/nevergrad_searchable_strategies.py diff --git a/python/mlir/sandbox/nevergrad_tuner_utils.py b/trunk/python/mlir/sandbox/nevergrad_tuner_utils.py similarity index 100% rename from python/mlir/sandbox/nevergrad_tuner_utils.py rename to trunk/python/mlir/sandbox/nevergrad_tuner_utils.py diff --git a/python/mlir/sandbox/pdl_utils.py b/trunk/python/mlir/sandbox/pdl_utils.py similarity index 100% rename from python/mlir/sandbox/pdl_utils.py rename to trunk/python/mlir/sandbox/pdl_utils.py diff --git a/python/mlir/sandbox/plotting.py b/trunk/python/mlir/sandbox/plotting.py similarity index 100% rename from python/mlir/sandbox/plotting.py rename to trunk/python/mlir/sandbox/plotting.py diff --git a/python/mlir/sandbox/problem_definition.py b/trunk/python/mlir/sandbox/problem_definition.py similarity index 100% rename from python/mlir/sandbox/problem_definition.py rename to trunk/python/mlir/sandbox/problem_definition.py diff --git a/python/mlir/sandbox/transform.py b/trunk/python/mlir/sandbox/transform.py similarity index 100% rename from python/mlir/sandbox/transform.py rename to trunk/python/mlir/sandbox/transform.py diff --git a/python/mlir/sandbox/transforms.py b/trunk/python/mlir/sandbox/transforms.py similarity index 100% rename from python/mlir/sandbox/transforms.py rename to trunk/python/mlir/sandbox/transforms.py diff --git a/python/mlir/sandbox/utils.py b/trunk/python/mlir/sandbox/utils.py similarity index 100% rename from python/mlir/sandbox/utils.py rename to trunk/python/mlir/sandbox/utils.py diff --git a/python/mlir/sandbox/variables.py b/trunk/python/mlir/sandbox/variables.py similarity index 100% rename from python/mlir/sandbox/variables.py rename to trunk/python/mlir/sandbox/variables.py diff --git a/python/tools/iree_benchmarks.py b/trunk/python/tools/iree_benchmarks.py similarity index 100% rename from python/tools/iree_benchmarks.py rename to trunk/python/tools/iree_benchmarks.py diff --git a/python/tools/llvm_mca.py b/trunk/python/tools/llvm_mca.py similarity index 100% rename from python/tools/llvm_mca.py rename to trunk/python/tools/llvm_mca.py diff --git a/python/tools/scheduler/scheduler.py b/trunk/python/tools/scheduler/scheduler.py similarity index 100% rename from python/tools/scheduler/scheduler.py rename to trunk/python/tools/scheduler/scheduler.py diff --git a/python/tools/scheduler/scheduler_test.py b/trunk/python/tools/scheduler/scheduler_test.py similarity index 100% rename from python/tools/scheduler/scheduler_test.py rename to trunk/python/tools/scheduler/scheduler_test.py diff --git a/requirements.txt b/trunk/requirements.txt similarity index 100% rename from requirements.txt rename to trunk/requirements.txt diff --git a/run_tests.py b/trunk/run_tests.py similarity index 100% rename from run_tests.py rename to trunk/run_tests.py diff --git a/scripts/mlirdev/bin/activate b/trunk/scripts/mlirdev/bin/activate similarity index 100% rename from scripts/mlirdev/bin/activate rename to trunk/scripts/mlirdev/bin/activate diff --git a/test/CMakeLists.txt b/trunk/test/CMakeLists.txt similarity index 100% rename from test/CMakeLists.txt rename to trunk/test/CMakeLists.txt diff --git a/test/Dialect/vector_ext/ops.mlir b/trunk/test/Dialect/vector_ext/ops.mlir similarity index 100% rename from test/Dialect/vector_ext/ops.mlir rename to trunk/test/Dialect/vector_ext/ops.mlir diff --git a/test/Dialect/vector_ext/vector_masking.mlir b/trunk/test/Dialect/vector_ext/vector_masking.mlir similarity index 100% rename from test/Dialect/vector_ext/vector_masking.mlir rename to trunk/test/Dialect/vector_ext/vector_masking.mlir diff --git a/test/Dialect/vector_ext/vector_predication.mlir b/trunk/test/Dialect/vector_ext/vector_predication.mlir similarity index 100% rename from test/Dialect/vector_ext/vector_predication.mlir rename to trunk/test/Dialect/vector_ext/vector_predication.mlir diff --git a/test/Integration/Dialect/VectorExt/CPU/test-vector-predication.mlir b/trunk/test/Integration/Dialect/VectorExt/CPU/test-vector-predication.mlir similarity index 100% rename from test/Integration/Dialect/VectorExt/CPU/test-vector-predication.mlir rename to trunk/test/Integration/Dialect/VectorExt/CPU/test-vector-predication.mlir diff --git a/include/CMakeLists.txt b/trunk/test/lib/CMakeLists.txt similarity index 100% rename from include/CMakeLists.txt rename to trunk/test/lib/CMakeLists.txt diff --git a/include/Dialect/CMakeLists.txt b/trunk/test/lib/Dialect/CMakeLists.txt similarity index 100% rename from include/Dialect/CMakeLists.txt rename to trunk/test/lib/Dialect/CMakeLists.txt diff --git a/test/lib/Dialect/VectorExt/CMakeLists.txt b/trunk/test/lib/Dialect/VectorExt/CMakeLists.txt similarity index 100% rename from test/lib/Dialect/VectorExt/CMakeLists.txt rename to trunk/test/lib/Dialect/VectorExt/CMakeLists.txt diff --git a/test/lib/Dialect/VectorExt/TestVectorMaskingUtils.cpp b/trunk/test/lib/Dialect/VectorExt/TestVectorMaskingUtils.cpp similarity index 100% rename from test/lib/Dialect/VectorExt/TestVectorMaskingUtils.cpp rename to trunk/test/lib/Dialect/VectorExt/TestVectorMaskingUtils.cpp diff --git a/test/lit.cfg.py b/trunk/test/lit.cfg.py similarity index 100% rename from test/lit.cfg.py rename to trunk/test/lit.cfg.py diff --git a/test/tensorcore/test_matmul_f16_cuda_mma.mlir b/trunk/test/tensorcore/test_matmul_f16_cuda_mma.mlir similarity index 100% rename from test/tensorcore/test_matmul_f16_cuda_mma.mlir rename to trunk/test/tensorcore/test_matmul_f16_cuda_mma.mlir diff --git a/tools/CMakeLists.txt b/trunk/tools/CMakeLists.txt similarity index 100% rename from tools/CMakeLists.txt rename to trunk/tools/CMakeLists.txt diff --git a/tools/extract_best_from_list.py b/trunk/tools/extract_best_from_list.py similarity index 100% rename from tools/extract_best_from_list.py rename to trunk/tools/extract_best_from_list.py diff --git a/tools/generate_list_of_commands.py b/trunk/tools/generate_list_of_commands.py similarity index 100% rename from tools/generate_list_of_commands.py rename to trunk/tools/generate_list_of_commands.py diff --git a/tools/mlir-proto-lsp-server/CMakeLists.txt b/trunk/tools/mlir-proto-lsp-server/CMakeLists.txt similarity index 100% rename from tools/mlir-proto-lsp-server/CMakeLists.txt rename to trunk/tools/mlir-proto-lsp-server/CMakeLists.txt diff --git a/tools/mlir-proto-lsp-server/mlir-proto-lsp-server.cpp b/trunk/tools/mlir-proto-lsp-server/mlir-proto-lsp-server.cpp similarity index 100% rename from tools/mlir-proto-lsp-server/mlir-proto-lsp-server.cpp rename to trunk/tools/mlir-proto-lsp-server/mlir-proto-lsp-server.cpp diff --git a/tools/mlir-proto-opt/CMakeLists.txt b/trunk/tools/mlir-proto-opt/CMakeLists.txt similarity index 100% rename from tools/mlir-proto-opt/CMakeLists.txt rename to trunk/tools/mlir-proto-opt/CMakeLists.txt diff --git a/tools/mlir-proto-opt/mlir-proto-opt.cpp b/trunk/tools/mlir-proto-opt/mlir-proto-opt.cpp similarity index 100% rename from tools/mlir-proto-opt/mlir-proto-opt.cpp rename to trunk/tools/mlir-proto-opt/mlir-proto-opt.cpp diff --git a/tools/plot_benchmark.py b/trunk/tools/plot_benchmark.py similarity index 100% rename from tools/plot_benchmark.py rename to trunk/tools/plot_benchmark.py