bench: more cleanup, drop redundant

devito/ir/ietxdsl/cluster_to_ssa.py

@@ -113,7 +113,7 @@ def _convert_eq(self, eq: LoweredEq):
         ), f"can only write to offset [0,0,0], given {offsets[1:]}"
 
         self.block.add_op(stencil.ReturnOp.get([rhs_result]))
-        outermost_block.add_op(func.Return.get())
+        outermost_block.add_op(func.Return())
 
         return func.FuncOp.from_region(
             "apply_kernel", [], [], Region([outermost_block])

devito/ir/ietxdsl/xdsl_passes.py

@@ -143,7 +143,7 @@ def _op_to_func(op: Operator):
             ietxdsl_functions.myVisit(i, block=block, ssa_vals=ssa_val_dict)
 
     # add a trailing return
-    block.add_op(func.Return.get())
+    block.add_op(func.Return())
 
     func_op = func.FuncOp.from_region(str(op.name), arg_types, [], Region([block]))
 

fast/nd_nwave_devito_nodamp.py

@@ -102,19 +102,16 @@ def plot_3dfunc(u):
 
 # Finally we define the source injection and receiver read function to generate
 # the corresponding code
+print(time_range)
 src_term = src.inject(field=u.forward, expr=src * dt**2 / model.m)
 op = Operator([stencil] + src_term, subs=model.spacing_map)
-
-print(time_range)
 # Run with source and plot
-# import pdb;pdb.set_trace()
 op.apply(time=time_range.num-1, dt=model.critical_dt)
 
 if len(shape) == 3:
     if args.plot:
         plot_3dfunc(u)
 
-
 initdata = u.data[:]
 
 # Run more with no sources now (Not supported in xdsl)
@@ -127,10 +124,9 @@ def plot_3dfunc(u):
 
 print(norm(u))
 
-
+# Reset initial data
 u.data[:] = initdata
 
-
 # Run more with no sources now (Not supported in xdsl)
 xdslop = XDSLOperator([stencil])
 xdslop.apply(time=time_range.num-1, dt=model.critical_dt)