add lowering and test

Author: bruteforceboy

clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp

@@ -84,6 +84,8 @@ struct LoweringPreparePass : public LoweringPrepareBase<LoweringPreparePass> {
   void lowerGlobalOp(GlobalOp op);
   void lowerDynamicCastOp(DynamicCastOp op);
   void lowerStdFindOp(StdFindOp op);
+  void lowerStdVectorCtorOp(StdVectorCtorOp op);
+  void lowerStdVectorDtorOp(StdVectorDtorOp op);
   void lowerIterBeginOp(IterBeginOp op);
   void lowerIterEndOp(IterEndOp op);
   void lowerToMemCpy(StoreOp op);
@@ -1496,6 +1498,28 @@ void LoweringPreparePass::lowerStdFindOp(StdFindOp op) {
   op.erase();
 }
 
+void LoweringPreparePass::lowerStdVectorCtorOp(StdVectorCtorOp op) {
+  CIRBaseBuilderTy builder(getContext());
+  builder.setInsertionPointAfter(op.getOperation());
+  auto call =
+      builder.createCallOp(op.getLoc(), op.getOriginalFnAttr(), mlir::Type{},
+                           mlir::ValueRange{op.getOperand()});
+
+  op.replaceAllUsesWith(call);
+  op.erase();
+}
+
+void LoweringPreparePass::lowerStdVectorDtorOp(StdVectorDtorOp op) {
+  CIRBaseBuilderTy builder(getContext());
+  builder.setInsertionPointAfter(op.getOperation());
+  auto call =
+      builder.createCallOp(op.getLoc(), op.getOriginalFnAttr(), mlir::Type{},
+                           mlir::ValueRange{op.getOperand()});
+
+  op.replaceAllUsesWith(call);
+  op.erase();
+}
+
 void LoweringPreparePass::lowerIterBeginOp(IterBeginOp op) {
   CIRBaseBuilderTy builder(getContext());
   builder.setInsertionPointAfter(op.getOperation());
@@ -1607,6 +1631,10 @@ void LoweringPreparePass::runOnOp(Operation *op) {
     lowerDynamicCastOp(dynamicCast);
   } else if (auto stdFind = dyn_cast<StdFindOp>(op)) {
     lowerStdFindOp(stdFind);
+  } else if (auto stdVectorCtorOp = dyn_cast<StdVectorCtorOp>(op)) {
+    lowerStdVectorCtorOp(stdVectorCtorOp);
+  } else if (auto stdVectorDtorOp = dyn_cast<StdVectorDtorOp>(op)) {
+    lowerStdVectorDtorOp(stdVectorDtorOp);
   } else if (auto iterBegin = dyn_cast<IterBeginOp>(op)) {
     lowerIterBeginOp(iterBegin);
   } else if (auto iterEnd = dyn_cast<IterEndOp>(op)) {
@@ -1652,8 +1680,9 @@ void LoweringPreparePass::runOnOperation() {
 
   op->walk([&](Operation *op) {
     if (isa<UnaryOp, BinOp, CastOp, ComplexBinOp, CmpThreeWayOp, VAArgOp,
-            GlobalOp, DynamicCastOp, StdFindOp, IterEndOp, IterBeginOp,
-            ArrayCtor, ArrayDtor, cir::FuncOp, StoreOp, ThrowOp, CallOp>(op))
+            GlobalOp, DynamicCastOp, StdFindOp, StdVectorCtorOp,
+            StdVectorDtorOp, IterEndOp, IterBeginOp, ArrayCtor, ArrayDtor,
+            cir::FuncOp, StoreOp, ThrowOp, CallOp>(op))
       opsToTransform.push_back(op);
   });
 

clang/test/CIR/Inputs/std-cxx.h

@@ -288,13 +288,13 @@ namespace std {
     typedef __vector_iterator<T, T *, T &> iterator;
     typedef __vector_iterator<T, const T *, const T &> const_iterator;
 
-    vector() : _start(0), _finish(0), _end_of_storage(0) {}
+    vector() : _start(0), _finish(0), _end_of_storage(0) {} // expected-remark {{found call to std::vector_cxx_ctor()}}
     template <typename InputIterator>
     vector(InputIterator first, InputIterator last);
     vector(const vector &other);
     vector(vector &&other);
     explicit vector(size_type count);
-    ~vector();
+    ~vector(); // expected-remark{{found call to std::vector_cxx_dtor()}}
 
     size_t size() const {
       return size_t(_finish - _start);

clang/test/CIR/Transforms/idiom-recognizer.cpp

@@ -47,3 +47,14 @@ void iter_test() {
   yolo::array<unsigned char, 3> v = {1, 2, 3};
   (void)v.begin(); // no remark should be produced.
 }
+
+void vector_test() {
+  std::vector<int> v; // expected-remark {{found call to std::vector_cxx_ctor()}}
+
+  // BEFORE-IDIOM: cir.call @_ZNSt6vectorIiEC1Ev(
+  // BEFORE-IDIOM: cir.call @_ZNSt6vectorIiED1Ev(
+  // AFTER-IDIOM: cir.std.vector_cxx_ctor(
+  // AFTER-IDIOM: cir.std.vector_cxx_dtor(
+  // AFTER-LOWERING-PREPARE: cir.call @_ZNSt6vectorIiEC1Ev(
+  // AFTER-LOWERING-PREPARE: cir.call @_ZNSt6vectorIiED1Ev(
+}