Skip to content

Commit a883e37

Browse files
batzorbatzor
committed
style: remove unneeded namespace
1 parent 4af58a4 commit a883e37

File tree

11 files changed

+41
-43
lines changed

11 files changed

+41
-43
lines changed

‎benchmark/field/mul_benchmark_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace zkir {
66
namespace {
77

8-
using ::zkir::benchmark::Memref;
8+
using benchmark::Memref;
99

1010
struct i256 {
1111
uint64_t limbs[4]; // 4 x 64 = 256 bits

‎benchmark/ntt/ntt_benchmark_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace zkir {
1111
namespace {
1212

13-
using ::zkir::benchmark::Memref;
13+
using benchmark::Memref;
1414

1515
using i256 = benchmark::BigInt<4>;
1616

‎zkir/Dialect/Arith/Conversions/ArithToModArith/ArithToModArith.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ namespace mlir::zkir::arith {
2929
static mod_arith::ModArithType convertArithType(Type type) {
3030
auto modulusBitSize = static_cast<uint64_t>(type.getIntOrFloatBitWidth());
3131
auto modulus = (1L << (modulusBitSize - 1L));
32-
auto newType = mlir::IntegerType::get(type.getContext(), modulusBitSize + 1);
32+
auto newType = IntegerType::get(type.getContext(), modulusBitSize + 1);
3333

3434
return mod_arith::ModArithType::get(type.getContext(),
35-
mlir::IntegerAttr::get(newType, modulus));
35+
IntegerAttr::get(newType, modulus));
3636
}
3737

3838
static Type convertArithLikeType(ShapedType type) {
@@ -129,14 +129,14 @@ struct ConvertExtUI : public OpConversionPattern<mlir::arith::ExtUIOp> {
129129
}
130130
};
131131

132-
struct ConvertLoadOp : public OpConversionPattern<mlir::memref::LoadOp> {
132+
struct ConvertLoadOp : public OpConversionPattern<memref::LoadOp> {
133133
explicit ConvertLoadOp(MLIRContext *context)
134-
: OpConversionPattern<mlir::memref::LoadOp>(context) {}
134+
: OpConversionPattern<memref::LoadOp>(context) {}
135135

136136
using OpConversionPattern::OpConversionPattern;
137137

138138
LogicalResult matchAndRewrite(
139-
::mlir::memref::LoadOp op, OpAdaptor adaptor,
139+
memref::LoadOp op, OpAdaptor adaptor,
140140
ConversionPatternRewriter &rewriter) const override {
141141
ImplicitLocOpBuilder b(op.getLoc(), rewriter);
142142

‎zkir/Dialect/ModArith/Conversions/ModArithToArith/ModArithToArith.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static TypedAttr modulusAttr(Op op, bool mul = false) {
7272
auto intType = IntegerType::get(op.getContext(), width);
7373
auto truncmod = modulus.zextOrTrunc(width);
7474

75-
if (auto st = mlir::dyn_cast<ShapedType>(type)) {
75+
if (auto st = dyn_cast<ShapedType>(type)) {
7676
auto containerType = st.cloneWith(st.getShape(), intType);
7777
return DenseElementsAttr::get(containerType, truncmod);
7878
}
@@ -330,7 +330,7 @@ struct ConvertInverse : public OpConversionPattern<InverseOp> {
330330
InverseOp op, OpAdaptor adaptor,
331331
ConversionPatternRewriter &rewriter) const override {
332332
// TODO(batzor): Support tensor input.
333-
if (mlir::isa<ShapedType>(op.getInput().getType())) {
333+
if (isa<ShapedType>(op.getInput().getType())) {
334334
return op->emitError("tensor input not supported");
335335
}
336336

‎zkir/Dialect/Poly/Conversions/PolyToField/PolyToField.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static std::pair<Value, Value> bflyGS(ImplicitLocOpBuilder &b, Value A, Value B,
234234
}
235235

236236
struct ConvertBitReverse : public OpConversionPattern<BitReverseOp> {
237-
explicit ConvertBitReverse(mlir::MLIRContext *context)
237+
explicit ConvertBitReverse(MLIRContext *context)
238238
: OpConversionPattern<BitReverseOp>(context) {}
239239

240240
using OpConversionPattern::OpConversionPattern;

‎zkir/Dialect/Poly/IR/PolyAttributes.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ static void precomputeRoots(APInt root, const APInt &mod, unsigned degree,
5959
pool.wait();
6060
}
6161

62-
zkir::field::PrimeFieldAttr PrimitiveRootAttr::getRoot() const {
62+
field::PrimeFieldAttr PrimitiveRootAttr::getRoot() const {
6363
return getImpl()->root;
6464
}
6565

66-
zkir::field::PrimeFieldAttr PrimitiveRootAttr::getInvRoot() const {
66+
field::PrimeFieldAttr PrimitiveRootAttr::getInvRoot() const {
6767
return getImpl()->invRoot;
6868
}
6969

7070
IntegerAttr PrimitiveRootAttr::getDegree() const { return getImpl()->degree; }
7171

72-
zkir::field::PrimeFieldAttr PrimitiveRootAttr::getInvDegree() const {
72+
field::PrimeFieldAttr PrimitiveRootAttr::getInvDegree() const {
7373
return getImpl()->invDegree;
7474
}
7575

@@ -81,7 +81,7 @@ DenseElementsAttr PrimitiveRootAttr::getInvRoots() const {
8181
return getImpl()->invRoots;
8282
}
8383

84-
zkir::mod_arith::MontgomeryAttr PrimitiveRootAttr::getMontgomery() const {
84+
mod_arith::MontgomeryAttr PrimitiveRootAttr::getMontgomery() const {
8585
return getImpl()->montgomery;
8686
}
8787

@@ -90,12 +90,12 @@ namespace detail {
9090
PrimitiveRootAttrStorage *PrimitiveRootAttrStorage::construct(
9191
AttributeStorageAllocator &allocator, KeyTy &&key) {
9292
// Extract the root and degree from the key.
93-
zkir::field::PrimeFieldAttr root = std::get<0>(key);
93+
field::PrimeFieldAttr root = std::get<0>(key);
9494
IntegerAttr degree = std::get<1>(key);
95-
zkir::mod_arith::MontgomeryAttr montgomery = std::get<2>(key);
95+
mod_arith::MontgomeryAttr montgomery = std::get<2>(key);
9696

9797
std::optional<IntegerAttr> montgomeryR;
98-
if (montgomery != zkir::mod_arith::MontgomeryAttr()) {
98+
if (montgomery != mod_arith::MontgomeryAttr()) {
9999
montgomeryR = montgomery.getR();
100100
}
101101

@@ -111,8 +111,8 @@ PrimitiveRootAttrStorage *PrimitiveRootAttrStorage::construct(
111111

112112
field::PrimeFieldAttr invDegree =
113113
field::PrimeFieldAttr::get(root.getType(), invDegreeVal);
114-
zkir::field::PrimeFieldAttr invRoot =
115-
zkir::field::PrimeFieldAttr::get(root.getType(), invRootVal);
114+
field::PrimeFieldAttr invRoot =
115+
field::PrimeFieldAttr::get(root.getType(), invRootVal);
116116

117117
// Compute the exponent table.
118118
SmallVector<APInt> roots, invRoots;

‎zkir/Dialect/Poly/IR/PolyAttributes.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
namespace mlir::zkir::poly::detail {
1414

1515
struct PrimitiveRootAttrStorage : public AttributeStorage {
16-
using KeyTy = std::tuple<zkir::field::PrimeFieldAttr, IntegerAttr,
16+
using KeyTy = std::tuple<field::PrimeFieldAttr, IntegerAttr,
1717
mod_arith::MontgomeryAttr>;
1818
PrimitiveRootAttrStorage(IntegerAttr degree,
19-
zkir::field::PrimeFieldAttr invDegree,
20-
zkir::field::PrimeFieldAttr root,
21-
zkir::field::PrimeFieldAttr invRoot,
19+
field::PrimeFieldAttr invDegree,
20+
field::PrimeFieldAttr root,
21+
field::PrimeFieldAttr invRoot,
2222
DenseElementsAttr roots, DenseElementsAttr invRoots,
23-
zkir::mod_arith::MontgomeryAttr montgomery)
23+
mod_arith::MontgomeryAttr montgomery)
2424
: degree(std::move(degree)),
2525
invDegree(std::move(invDegree)),
2626
root(std::move(root)),
@@ -44,12 +44,12 @@ struct PrimitiveRootAttrStorage : public AttributeStorage {
4444
AttributeStorageAllocator &allocator, KeyTy &&key);
4545

4646
IntegerAttr degree;
47-
zkir::field::PrimeFieldAttr invDegree;
48-
zkir::field::PrimeFieldAttr root;
49-
zkir::field::PrimeFieldAttr invRoot;
47+
field::PrimeFieldAttr invDegree;
48+
field::PrimeFieldAttr root;
49+
field::PrimeFieldAttr invRoot;
5050
DenseElementsAttr roots;
5151
DenseElementsAttr invRoots;
52-
zkir::mod_arith::MontgomeryAttr montgomery;
52+
mod_arith::MontgomeryAttr montgomery;
5353
};
5454

5555
} // namespace mlir::zkir::poly::detail

‎zkir/Dialect/Poly/IR/PolyOps.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ParseResult ConstantOp::parse(OpAsmParser &parser, OperationState &result) {
1414
if (attr) {
1515
if (failed(parser.parseColonType(type))) return failure();
1616
polynomial::IntPolynomialAttr intPolyAttr =
17-
mlir::cast<polynomial::IntPolynomialAttr>(attr);
17+
cast<polynomial::IntPolynomialAttr>(attr);
1818

1919
result.addAttribute("value", UnivariatePolyAttr::get(parser.getContext(),
2020
type, intPolyAttr));

‎zkir/Pipelines/PipelineRegistration.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ void oneShotBufferize(OpPassManager &manager) {
4040
manager.addPass(bufferization::createBufferDeallocationSimplificationPass());
4141
manager.addPass(bufferization::createLowerDeallocationsPass());
4242
manager.addPass(createCSEPass());
43-
manager.addPass(mlir::createBufferizationToMemRefPass());
43+
manager.addPass(createBufferizationToMemRefPass());
4444
manager.addPass(createCanonicalizerPass());
4545
}
4646

4747
void ellipticCurveToLLVMPipelineBuilder(OpPassManager &manager) {
48-
manager.addPass(zkir::elliptic_curve::createEllipticCurveToField());
49-
manager.addPass(zkir::field::createPrimeFieldToModArith());
50-
manager.addPass(zkir::mod_arith::createModArithToArith());
48+
manager.addPass(elliptic_curve::createEllipticCurveToField());
49+
manager.addPass(field::createPrimeFieldToModArith());
50+
manager.addPass(mod_arith::createModArithToArith());
5151
manager.addPass(createCanonicalizerPass());
5252

5353
// Linalg
@@ -95,9 +95,9 @@ void ellipticCurveToLLVMPipelineBuilder(OpPassManager &manager) {
9595

9696
template <bool allowOpenMP>
9797
void polyToLLVMPipelineBuilder(OpPassManager &manager) {
98-
manager.addPass(zkir::poly::createPolyToField());
99-
manager.addPass(zkir::field::createPrimeFieldToModArith());
100-
manager.addPass(zkir::mod_arith::createModArithToArith());
98+
manager.addPass(poly::createPolyToField());
99+
manager.addPass(field::createPrimeFieldToModArith());
100+
manager.addPass(mod_arith::createModArithToArith());
101101
// FIXME(batzor): With this, some memref loads are canonicalized even though
102102
// it was modified in the middle, causing `poly_ntt_runner` test to fail.
103103
// manager.addPass(createCanonicalizerPass());
@@ -151,7 +151,7 @@ void polyToLLVMPipelineBuilder(OpPassManager &manager) {
151151
manager.addPass(createSymbolDCEPass());
152152
}
153153

154-
template void polyToLLVMPipelineBuilder<false>(mlir::OpPassManager &manager);
155-
template void polyToLLVMPipelineBuilder<true>(mlir::OpPassManager &manager);
154+
template void polyToLLVMPipelineBuilder<false>(OpPassManager &manager);
155+
template void polyToLLVMPipelineBuilder<true>(OpPassManager &manager);
156156

157157
} // namespace mlir::zkir::pipelines

‎zkir/Pipelines/PipelineRegistration.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ template <bool allowOpenMP>
1313
void polyToLLVMPipelineBuilder(OpPassManager &manager);
1414
void ellipticCurveToLLVMPipelineBuilder(OpPassManager &manager);
1515

16-
extern template void polyToLLVMPipelineBuilder<false>(
17-
mlir::OpPassManager &manager);
18-
extern template void polyToLLVMPipelineBuilder<true>(
19-
mlir::OpPassManager &manager);
16+
extern template void polyToLLVMPipelineBuilder<false>(OpPassManager &manager);
17+
extern template void polyToLLVMPipelineBuilder<true>(OpPassManager &manager);
2018

2119
} // namespace mlir::zkir::pipelines
2220

0 commit comments

Comments
 (0)