Skip to content

Commit 6f59a78

Browse files
schweitzpgischweitzpgi
committed
Fix tests.
Signed-off-by: Eric Schweitz <eschweitz@nvidia.com>
1 parent d5dfd30 commit 6f59a78

File tree

12 files changed

+143
-239
lines changed

12 files changed

+143
-239
lines changed

‎python/tests/mlir/adjoint.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def test_sample_adjoint_qubit():
241241
# CHECK: quake.x %[[VAL_0]] : (!quake.ref) -> ()
242242
# CHECK: call @__nvqpp__mlirgen____nvqppBuilderKernel_{{.*}}(%[[VAL_0]]) : (!quake.ref) -> ()
243243
# CHECK: quake.apply<adj> @__nvqpp__mlirgen____nvqppBuilderKernel_{{.*}} %[[VAL_0]] : (!quake.ref) -> ()
244-
# CHECK: %[[VAL_1:.*]] = quake.mz %[[VAL_0]] name "" : (!quake.ref) -> !quake.measure
244+
# CHECK: %[[VAL_1:.*]] = quake.mz %[[VAL_0]] : (!quake.ref) -> !quake.measure
245245
# CHECK: return
246246
# CHECK: }
247247

@@ -302,7 +302,7 @@ def test_sample_adjoint_qreg():
302302
# CHECK: } {invariant}
303303
# CHECK: call @__nvqpp__mlirgen____nvqppBuilderKernel_{{.*}}(%[[VAL_3]]) : (!quake.veq<?>) -> ()
304304
# CHECK: quake.apply<adj> @__nvqpp__mlirgen____nvqppBuilderKernel_{{.*}} %[[VAL_3]] : (!quake.veq<?>) -> ()
305-
# CHECK: %[[VAL_13:.*]] = quake.mz %0 name "" : (!quake.veq<?>) -> !cc.stdvec<!quake.measure>
305+
# CHECK: %[[VAL_13:.*]] = quake.mz %0 : (!quake.veq<?>) -> !cc.stdvec<!quake.measure>
306306
# CHECK: return
307307
# CHECK: }
308308

‎python/tests/mlir/ast_elif.py‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,44 +37,23 @@ def cost(thetas: np.ndarray): # can pass 1D ndarray or list
3737
# CHECK-DAG: %[[VAL_4:.*]] = arith.constant 4 : i64
3838
# CHECK: %[[VAL_5:.*]] = quake.alloca !quake.veq<4>
3939
# CHECK: %[[VAL_6:.*]] = cc.stdvec_size %[[VAL_0]] : (!cc.stdvec<f64>) -> i64
40-
# CHECK: %[[VAL_7:.*]] = cc.alloca !cc.struct<{i64, f64}>{{\[}}%[[VAL_6]] : i64]
41-
# CHECK: %[[VAL_8:.*]] = cc.loop while ((%[[VAL_9:.*]] = %[[VAL_3]]) -> (i64)) {
42-
# CHECK: %[[VAL_10:.*]] = arith.cmpi slt, %[[VAL_9]], %[[VAL_6]] : i64
43-
# CHECK: cc.condition %[[VAL_10]](%[[VAL_9]] : i64)
44-
# CHECK: } do {
45-
# CHECK: ^bb0(%[[VAL_11:.*]]: i64):
46-
# CHECK: %[[VAL_12:.*]] = cc.undef !cc.struct<{i64, f64}>
47-
# CHECK: %[[VAL_13:.*]] = cc.stdvec_data %[[VAL_0]] : (!cc.stdvec<f64>) -> !cc.ptr<!cc.array<f64 x ?>>
48-
# CHECK: %[[VAL_14:.*]] = cc.compute_ptr %[[VAL_13]][%[[VAL_11]]] : (!cc.ptr<!cc.array<f64 x ?>>, i64) -> !cc.ptr<f64>
49-
# CHECK: %[[VAL_15:.*]] = cc.load %[[VAL_14]] : !cc.ptr<f64>
50-
# CHECK: %[[VAL_16:.*]] = cc.compute_ptr %[[VAL_7]]{{\[}}%[[VAL_11]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, f64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, f64}>>
51-
# CHECK: %[[VAL_17:.*]] = cc.insert_value %[[VAL_11]], %[[VAL_12]][0] : (!cc.struct<{i64, f64}>, i64) -> !cc.struct<{i64, f64}>
52-
# CHECK: %[[VAL_18:.*]] = cc.insert_value %[[VAL_15]], %[[VAL_17]][1] : (!cc.struct<{i64, f64}>, f64) -> !cc.struct<{i64, f64}>
53-
# CHECK: cc.store %[[VAL_18]], %[[VAL_16]] : !cc.ptr<!cc.struct<{i64, f64}>>
54-
# CHECK: cc.continue %[[VAL_11]] : i64
55-
# CHECK: } step {
56-
# CHECK: ^bb0(%[[VAL_19:.*]]: i64):
57-
# CHECK: %[[VAL_20:.*]] = arith.addi %[[VAL_19]], %[[VAL_2]] : i64
58-
# CHECK: cc.continue %[[VAL_20]] : i64
59-
# CHECK: } {invariant}
6040
# CHECK: %[[VAL_21:.*]] = cc.loop while ((%[[VAL_22:.*]] = %[[VAL_3]]) -> (i64)) {
6141
# CHECK: %[[VAL_23:.*]] = arith.cmpi slt, %[[VAL_22]], %[[VAL_6]] : i64
6242
# CHECK: cc.condition %[[VAL_23]](%[[VAL_22]] : i64)
6343
# CHECK: } do {
6444
# CHECK: ^bb0(%[[VAL_24:.*]]: i64):
65-
# CHECK: %[[VAL_25:.*]] = cc.compute_ptr %[[VAL_7]]{{\[}}%[[VAL_24]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, f64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, f64}>>
66-
# CHECK: %[[VAL_26:.*]] = cc.load %[[VAL_25]] : !cc.ptr<!cc.struct<{i64, f64}>>
67-
# CHECK: %[[VAL_27:.*]] = cc.extract_value %[[VAL_26]][0] : (!cc.struct<{i64, f64}>) -> i64
68-
# CHECK: %[[VAL_28:.*]] = cc.extract_value %[[VAL_26]][1] : (!cc.struct<{i64, f64}>) -> f64
69-
# CHECK: %[[VAL_29:.*]] = arith.remui %[[VAL_27]], %[[VAL_1]] : i64
45+
# CHECK: %[[VAL_7:.*]] = cc.stdvec_data %[[VAL_0]] : (!cc.stdvec<f64>) -> !cc.ptr<!cc.array<i64 x ?>>
46+
# CHECK: %[[VAL_25:.*]] = cc.compute_ptr %[[VAL_7]][%[[VAL_24]]] : (!cc.ptr<!cc.array<f64> x ?>>, i64) -> !cc.ptr<f64>
47+
# CHECK: %[[VAL_29:.*]] = arith.remui %[[VAL_24]], %[[VAL_1]] : i64
7048
# CHECK: %[[VAL_30:.*]] = arith.cmpi ne, %[[VAL_29]], %[[VAL_3]] : i64
49+
# CHECK: %[[VAL_28:.*]] = cc.load %[[VAL_25]] : !cc.ptr<f64>
7150
# CHECK: cc.if(%[[VAL_30]]) {
72-
# CHECK: %[[VAL_31:.*]] = arith.remui %[[VAL_27]], %[[VAL_4]] : i64
73-
# CHECK: %[[VAL_32:.*]] = quake.extract_ref %[[VAL_5]]{{\[}}%[[VAL_31]]] : (!quake.veq<4>, i64) -> !quake.ref
51+
# CHECK: %[[VAL_31:.*]] = arith.remui %[[VAL_24]], %[[VAL_4]] : i64
52+
# CHECK: %[[VAL_32:.*]] = quake.extract_ref %[[VAL_5]][%[[VAL_31]]] : (!quake.veq<4>, i64) -> !quake.ref
7453
# CHECK: quake.ry (%[[VAL_28]]) %[[VAL_32]] : (f64, !quake.ref) -> ()
7554
# CHECK: } else {
76-
# CHECK: %[[VAL_33:.*]] = arith.remui %[[VAL_27]], %[[VAL_4]] : i64
77-
# CHECK: %[[VAL_34:.*]] = quake.extract_ref %[[VAL_5]]{{\[}}%[[VAL_33]]] : (!quake.veq<4>, i64) -> !quake.ref
55+
# CHECK: %[[VAL_33:.*]] = arith.remui %[[VAL_24]], %[[VAL_4]] : i64
56+
# CHECK: %[[VAL_34:.*]] = quake.extract_ref %[[VAL_5]][%[[VAL_33]]] : (!quake.veq<4>, i64) -> !quake.ref
7857
# CHECK: quake.rx (%[[VAL_28]]) %[[VAL_34]] : (f64, !quake.ref) -> ()
7958
# CHECK: }
8059
# CHECK: cc.continue %[[VAL_24]] : i64

‎python/tests/mlir/ast_list_init.py‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,37 +48,16 @@ def kernel():
4848
# CHECK: cc.store %[[VAL_13]], %[[VAL_14]] : !cc.ptr<!cc.stdvec<f64>>
4949
# CHECK: %[[VAL_15:.*]] = cc.load %[[VAL_14]] : !cc.ptr<!cc.stdvec<f64>>
5050
# CHECK: %[[VAL_16:.*]] = cc.stdvec_size %[[VAL_15]] : (!cc.stdvec<f64>) -> i64
51-
# CHECK: %[[VAL_17:.*]] = cc.alloca !cc.struct<{i64, f64}>[%[[VAL_16]] : i64]
52-
# CHECK: %[[VAL_18:.*]] = cc.loop while ((%[[VAL_19:.*]] = %[[VAL_1]]) -> (i64)) {
53-
# CHECK: %[[VAL_20:.*]] = arith.cmpi slt, %[[VAL_19]], %[[VAL_16]] : i64
54-
# CHECK: cc.condition %[[VAL_20]](%[[VAL_19]] : i64)
55-
# CHECK: } do {
56-
# CHECK: ^bb0(%[[VAL_21:.*]]: i64):
57-
# CHECK: %[[VAL_22:.*]] = cc.undef !cc.struct<{i64, f64}>
58-
# CHECK: %[[VAL_23:.*]] = cc.stdvec_data %[[VAL_15]] : (!cc.stdvec<f64>) -> !cc.ptr<!cc.array<f64 x ?>>
59-
# CHECK: %[[VAL_24:.*]] = cc.compute_ptr %[[VAL_23]][%[[VAL_21]]] : (!cc.ptr<!cc.array<f64 x ?>>, i64) -> !cc.ptr<f64>
60-
# CHECK: %[[VAL_25:.*]] = cc.load %[[VAL_24]] : !cc.ptr<f64>
61-
# CHECK: %[[VAL_26:.*]] = cc.compute_ptr %[[VAL_17]][%[[VAL_21]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, f64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, f64}>>
62-
# CHECK: %[[VAL_27:.*]] = cc.insert_value %[[VAL_21]], %[[VAL_22]][0] : (!cc.struct<{i64, f64}>, i64) -> !cc.struct<{i64, f64}>
63-
# CHECK: %[[VAL_28:.*]] = cc.insert_value %[[VAL_25]], %[[VAL_27]][1] : (!cc.struct<{i64, f64}>, f64) -> !cc.struct<{i64, f64}>
64-
# CHECK: cc.store %[[VAL_28]], %[[VAL_26]] : !cc.ptr<!cc.struct<{i64, f64}>>
65-
# CHECK: cc.continue %[[VAL_21]] : i64
66-
# CHECK: } step {
67-
# CHECK: ^bb0(%[[VAL_29:.*]]: i64):
68-
# CHECK: %[[VAL_30:.*]] = arith.addi %[[VAL_29]], %[[VAL_0]] : i64
69-
# CHECK: cc.continue %[[VAL_30]] : i64
70-
# CHECK: } {invariant}
7151
# CHECK: %[[VAL_31:.*]] = cc.loop while ((%[[VAL_32:.*]] = %[[VAL_1]]) -> (i64)) {
7252
# CHECK: %[[VAL_33:.*]] = arith.cmpi slt, %[[VAL_32]], %[[VAL_16]] : i64
7353
# CHECK: cc.condition %[[VAL_33]](%[[VAL_32]] : i64)
7454
# CHECK: } do {
7555
# CHECK: ^bb0(%[[VAL_34:.*]]: i64):
76-
# CHECK: %[[VAL_35:.*]] = cc.compute_ptr %[[VAL_17]]{{\[}}%[[VAL_34]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, f64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, f64}>>
77-
# CHECK: %[[VAL_36:.*]] = cc.load %[[VAL_35]] : !cc.ptr<!cc.struct<{i64, f64}>>
78-
# CHECK: %[[VAL_37:.*]] = cc.extract_value %[[VAL_36]][0] : (!cc.struct<{i64, f64}>) -> i64
79-
# CHECK: %[[VAL_38:.*]] = cc.extract_value %[[VAL_36]][1] : (!cc.struct<{i64, f64}>) -> f64
80-
# CHECK: %[[VAL_39:.*]] = quake.extract_ref %[[VAL_7]]{{\[}}%[[VAL_37]]] : (!quake.veq<6>, i64) -> !quake.ref
81-
# CHECK: quake.ry (%[[VAL_38]]) %[[VAL_39]] : (f64, !quake.ref) -> ()
56+
# CHECK: %[[VAL_17:.*]] = cc.stdvec_data %[[VAL_15]] : (!cc.stdvec<f64>) -> !cc.ptr<!cc.array<f64 x ?>>
57+
# CHECK: %[[VAL_35:.*]] = cc.compute_ptr %[[VAL_17]][%[[VAL_34]]] : (!cc.ptr<!cc.array<f64> x ?>>, i64) -> !cc.ptr<f64>
58+
# CHECK: %[[VAL_36:.*]] = cc.load %[[VAL_35]] : !cc.ptr<f64>
59+
# CHECK: %[[VAL_39:.*]] = quake.extract_ref %[[VAL_7]][%[[VAL_34]]] : (!quake.veq<6>, i64) -> !quake.ref
60+
# CHECK: quake.ry (%[[VAL_36]]) %[[VAL_39]] : (f64, !quake.ref) -> ()
8261
# CHECK: cc.continue %[[VAL_34]] : i64
8362
# CHECK: } step {
8463
# CHECK: ^bb0(%[[VAL_40:.*]]: i64):

‎python/tests/mlir/ast_list_int.py‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,46 +26,24 @@ def oracle(register: cudaq.qview, auxillary_qubit: cudaq.qubit,
2626

2727

2828
# CHECK-LABEL: func.func @__nvqpp__mlirgen__oracle(
29-
# CHECK-SAME: %[[VAL_0:.*]]: !quake.veq<?>,
30-
# CHECK-SAME: %[[VAL_1:.*]]: !quake.ref,
31-
# CHECK-SAME: %[[VAL_2:.*]]: !cc.stdvec<i64>)
32-
# CHECK-DAG: %[[VAL_3:.*]] = arith.constant 1 : i64
33-
# CHECK-DAG: %[[VAL_4:.*]] = arith.constant 0 : i64
29+
# CHECK-SAME: %[[VAL_0:.*]]: !quake.veq<?>, %[[VAL_1:.*]]: !quake.ref,
30+
# CHECK-SAME: %[[VAL_2:.*]]: !cc.stdvec<i64>)
31+
# CHECK-DAG: %[[VAL_3:.*]] = arith.constant 1 : i64
32+
# CHECK-DAG: %[[VAL_4:.*]] = arith.constant 0 : i64
3433
# CHECK: %[[VAL_5:.*]] = cc.stdvec_size %[[VAL_2]] : (!cc.stdvec<i64>) -> i64
3534
# CHECK: %[[VAL_6:.*]] = cc.alloca i64
3635
# CHECK: cc.store %[[VAL_5]], %[[VAL_6]] : !cc.ptr<i64>
37-
# CHECK: %[[VAL_7:.*]] = cc.alloca !cc.struct<{i64, i64}>{{\[}}%[[VAL_5]] : i64]
38-
# CHECK: %[[VAL_8:.*]] = cc.loop while ((%[[VAL_9:.*]] = %[[VAL_4]]) -> (i64)) {
39-
# CHECK: %[[VAL_10:.*]] = arith.cmpi slt, %[[VAL_9]], %[[VAL_5]] : i64
40-
# CHECK: cc.condition %[[VAL_10]](%[[VAL_9]] : i64)
41-
# CHECK: } do {
42-
# CHECK: ^bb0(%[[VAL_11:.*]]: i64):
43-
# CHECK: %[[VAL_12:.*]] = cc.undef !cc.struct<{i64, i64}>
44-
# CHECK: %[[VAL_13:.*]] = cc.stdvec_data %[[VAL_2]] : (!cc.stdvec<i64>) -> !cc.ptr<!cc.array<i64 x ?>>
45-
# CHECK: %[[VAL_14:.*]] = cc.compute_ptr %[[VAL_13]][%[[VAL_11]]] : (!cc.ptr<!cc.array<i64 x ?>>, i64) -> !cc.ptr<i64>
46-
# CHECK: %[[VAL_15:.*]] = cc.load %[[VAL_14]] : !cc.ptr<i64>
47-
# CHECK: %[[VAL_16:.*]] = cc.compute_ptr %[[VAL_7]]{{\[}}%[[VAL_11]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, i64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, i64}>>
48-
# CHECK: %[[VAL_17:.*]] = cc.insert_value %[[VAL_11]], %[[VAL_12]][0] : (!cc.struct<{i64, i64}>, i64) -> !cc.struct<{i64, i64}>
49-
# CHECK: %[[VAL_18:.*]] = cc.insert_value %[[VAL_15]], %[[VAL_17]][1] : (!cc.struct<{i64, i64}>, i64) -> !cc.struct<{i64, i64}>
50-
# CHECK: cc.store %[[VAL_18]], %[[VAL_16]] : !cc.ptr<!cc.struct<{i64, i64}>>
51-
# CHECK: cc.continue %[[VAL_11]] : i64
52-
# CHECK: } step {
53-
# CHECK: ^bb0(%[[VAL_19:.*]]: i64):
54-
# CHECK: %[[VAL_20:.*]] = arith.addi %[[VAL_19]], %[[VAL_3]] : i64
55-
# CHECK: cc.continue %[[VAL_20]] : i64
56-
# CHECK: } {invariant}
5736
# CHECK: %[[VAL_21:.*]] = cc.loop while ((%[[VAL_22:.*]] = %[[VAL_4]]) -> (i64)) {
5837
# CHECK: %[[VAL_23:.*]] = arith.cmpi slt, %[[VAL_22]], %[[VAL_5]] : i64
5938
# CHECK: cc.condition %[[VAL_23]](%[[VAL_22]] : i64)
6039
# CHECK: } do {
6140
# CHECK: ^bb0(%[[VAL_24:.*]]: i64):
62-
# CHECK: %[[VAL_25:.*]] = cc.compute_ptr %[[VAL_7]]{{\[}}%[[VAL_24]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, i64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, i64}>>
63-
# CHECK: %[[VAL_26:.*]] = cc.load %[[VAL_25]] : !cc.ptr<!cc.struct<{i64, i64}>>
64-
# CHECK: %[[VAL_27:.*]] = cc.extract_value %[[VAL_26]][0] : (!cc.struct<{i64, i64}>) -> i64
65-
# CHECK: %[[VAL_28:.*]] = cc.extract_value %[[VAL_26]][1] : (!cc.struct<{i64, i64}>) -> i64
66-
# CHECK: %[[VAL_29:.*]] = arith.cmpi eq, %[[VAL_28]], %[[VAL_3]] : i64
41+
# CHECK: %[[VAL_7:.*]] = cc.stdvec_data %[[VAL_2]] : (!cc.stdvec<i64>) -> !cc.ptr<!cc.array<i64 x ?>>
42+
# CHECK: %[[VAL_25:.*]] = cc.compute_ptr %[[VAL_7]][%[[VAL_24]]] : (!cc.ptr<!cc.array<i64> x ?>>, i64) -> !cc.ptr<i64>
43+
# CHECK: %[[VAL_26:.*]] = cc.load %[[VAL_25]] : !cc.ptr<i64>
44+
# CHECK: %[[VAL_29:.*]] = arith.cmpi eq, %[[VAL_26]], %[[VAL_3]] : i64
6745
# CHECK: cc.if(%[[VAL_29]]) {
68-
# CHECK: %[[VAL_30:.*]] = quake.extract_ref %[[VAL_0]]{{\[}}%[[VAL_27]]] : (!quake.veq<?>, i64) -> !quake.ref
46+
# CHECK: %[[VAL_30:.*]] = quake.extract_ref %[[VAL_0]][%[[VAL_27]]] : (!quake.veq<?>, i64) -> !quake.ref
6947
# CHECK: quake.x {{\[}}%[[VAL_30]]] %[[VAL_1]] : (!quake.ref, !quake.ref) -> ()
7048
# CHECK: }
7149
# CHECK: cc.continue %[[VAL_24]] : i64

‎python/tests/mlir/ast_qreg_slice.py‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,38 +97,17 @@ def slice():
9797
# CHECK: cc.store %[[VAL_28]], %[[VAL_29]] : !cc.ptr<!cc.stdvec<i64>>
9898
# CHECK: %[[VAL_30:.*]] = cc.load %[[VAL_29]] : !cc.ptr<!cc.stdvec<i64>>
9999
# CHECK: %[[VAL_31:.*]] = cc.stdvec_size %[[VAL_30]] : (!cc.stdvec<i64>) -> i64
100-
# CHECK: %[[VAL_32:.*]] = cc.alloca !cc.struct<{i64, i64}>{{\[}}%[[VAL_31]] : i64]
101-
# CHECK: %[[VAL_33:.*]] = cc.loop while ((%[[VAL_34:.*]] = %[[VAL_6]]) -> (i64)) {
102-
# CHECK: %[[VAL_35:.*]] = arith.cmpi slt, %[[VAL_34]], %[[VAL_31]] : i64
103-
# CHECK: cc.condition %[[VAL_35]](%[[VAL_34]] : i64)
104-
# CHECK: } do {
105-
# CHECK: ^bb0(%[[VAL_36:.*]]: i64):
106-
# CHECK: %[[VAL_37:.*]] = cc.undef !cc.struct<{i64, i64}>
107-
# CHECK: %[[VAL_38:.*]] = cc.stdvec_data %[[VAL_30]] : (!cc.stdvec<i64>) -> !cc.ptr<!cc.array<i64 x ?>>
108-
# CHECK: %[[VAL_39:.*]] = cc.compute_ptr %[[VAL_38]][%[[VAL_36]]] : (!cc.ptr<!cc.array<i64 x ?>>, i64) -> !cc.ptr<i64>
109-
# CHECK: %[[VAL_40:.*]] = cc.load %[[VAL_39]] : !cc.ptr<i64>
110-
# CHECK: %[[VAL_41:.*]] = cc.compute_ptr %[[VAL_32]]{{\[}}%[[VAL_36]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, i64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, i64}>>
111-
# CHECK: %[[VAL_42:.*]] = cc.insert_value %[[VAL_36]], %[[VAL_37]][0] : (!cc.struct<{i64, i64}>, i64) -> !cc.struct<{i64, i64}>
112-
# CHECK: %[[VAL_43:.*]] = cc.insert_value %[[VAL_40]], %[[VAL_42]][1] : (!cc.struct<{i64, i64}>, i64) -> !cc.struct<{i64, i64}>
113-
# CHECK: cc.store %[[VAL_43]], %[[VAL_41]] : !cc.ptr<!cc.struct<{i64, i64}>>
114-
# CHECK: cc.continue %[[VAL_36]] : i64
115-
# CHECK: } step {
116-
# CHECK: ^bb0(%[[VAL_44:.*]]: i64):
117-
# CHECK: %[[VAL_45:.*]] = arith.addi %[[VAL_44]], %[[VAL_3]] : i64
118-
# CHECK: cc.continue %[[VAL_45]] : i64
119-
# CHECK: } {invariant}
120100
# CHECK: %[[VAL_46:.*]] = cc.loop while ((%[[VAL_47:.*]] = %[[VAL_6]]) -> (i64)) {
121101
# CHECK: %[[VAL_48:.*]] = arith.cmpi slt, %[[VAL_47]], %[[VAL_31]] : i64
122102
# CHECK: cc.condition %[[VAL_48]](%[[VAL_47]] : i64)
123103
# CHECK: } do {
124104
# CHECK: ^bb0(%[[VAL_49:.*]]: i64):
125-
# CHECK: %[[VAL_50:.*]] = cc.compute_ptr %[[VAL_32]]{{\[}}%[[VAL_49]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, i64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, i64}>>
126-
# CHECK: %[[VAL_51:.*]] = cc.load %[[VAL_50]] : !cc.ptr<!cc.struct<{i64, i64}>>
127-
# CHECK: %[[VAL_52:.*]] = cc.extract_value %[[VAL_51]][0] : (!cc.struct<{i64, i64}>) -> i64
128-
# CHECK: %[[VAL_53:.*]] = cc.extract_value %[[VAL_51]][1] : (!cc.struct<{i64, i64}>) -> i64
129-
# CHECK: %[[VAL_54:.*]] = arith.remui %[[VAL_52]], %[[VAL_1]] : i64
130-
# CHECK: %[[VAL_55:.*]] = quake.extract_ref %[[VAL_7]]{{\[}}%[[VAL_54]]] : (!quake.veq<4>, i64) -> !quake.ref
131-
# CHECK: %[[VAL_56:.*]] = arith.sitofp %[[VAL_53]] : i64 to f64
105+
# CHECK: %[[VAL_32:.*]] = cc.stdvec_data %[[VAL_30]] : (!cc.stdvec<i64>) -> !cc.ptr<!cc.array<i64 x ?>>
106+
# CHECK: %[[VAL_50:.*]] = cc.compute_ptr %[[VAL_32]][%[[VAL_49]]] : (!cc.ptr<!cc.array<!cc.struct<{i64, i64}> x ?>>, i64) -> !cc.ptr<!cc.struct<{i64, i64}>>
107+
# CHECK: %[[VAL_51:.*]] = cc.load %[[VAL_50]] : !cc.ptr<i64>
108+
# CHECK: %[[VAL_54:.*]] = arith.remui %[[VAL_49]], %[[VAL_1]] : i64
109+
# CHECK: %[[VAL_55:.*]] = quake.extract_ref %[[VAL_7]][%[[VAL_54]]] : (!quake.veq<4>, i64) -> !quake.ref
110+
# CHECK: %[[VAL_56:.*]] = arith.sitofp %[[VAL_51]] : i64 to f64
132111
# CHECK: quake.ry (%[[VAL_56]]) %[[VAL_55]] : (f64, !quake.ref) -> ()
133112
# CHECK: cc.continue %[[VAL_49]] : i64
134113
# CHECK: } step {

‎python/tests/mlir/conditional.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def test_function():
5959
# CHECK: %[[VAL_9:.*]] = quake.discriminate %[[VAL_8]] : (!quake.measure) -> i1
6060
# CHECK: cc.if(%[[VAL_9]]) {
6161
# CHECK: quake.x %[[VAL_7]] : (!quake.ref) -> ()
62-
# CHECK: %[[VAL_10:.*]] = quake.mz %[[VAL_7]] name "" : (!quake.ref) -> !quake.measure
62+
# CHECK: %[[VAL_10:.*]] = quake.mz %[[VAL_7]] : (!quake.ref) -> !quake.measure
6363
# CHECK: }
6464
# CHECK: %[[VAL_11:.*]] = cc.loop while ((%[[VAL_12:.*]] = %[[VAL_2]]) -> (i64)) {
6565
# CHECK: %[[VAL_13:.*]] = arith.cmpi slt, %[[VAL_12]], %[[VAL_0]] : i64
@@ -76,7 +76,7 @@ def test_function():
7676
# CHECK: } {invariant}
7777
# CHECK: cc.if(%[[VAL_9]]) {
7878
# CHECK: quake.x %[[VAL_7]] : (!quake.ref) -> ()
79-
# CHECK: %[[VAL_18:.*]] = quake.mz %[[VAL_7]] name "" : (!quake.ref) -> !quake.measure
79+
# CHECK: %[[VAL_18:.*]] = quake.mz %[[VAL_7]] : (!quake.ref) -> !quake.measure
8080
# CHECK: }
8181
# CHECK: return
8282
# CHECK: }
@@ -117,7 +117,7 @@ def then_function():
117117
# CHECK-LABEL: func.func @__nvqpp__mlirgen____nvqppBuilderKernel_{{.*}}() attributes {"cudaq-entrypoint"
118118
# CHECK: %[[VAL_0:.*]] = quake.alloca !quake.ref
119119
# CHECK: quake.x %[[VAL_0]] : (!quake.ref) -> ()
120-
# CHECK: %[[VAL_1:.*]] = quake.mz %[[VAL_0]] name "" : (!quake.ref) -> !quake.measure
120+
# CHECK: %[[VAL_1:.*]] = quake.mz %[[VAL_0]] : (!quake.ref) -> !quake.measure
121121
# CHECK: %[[VAL_2:.*]] = quake.discriminate %[[VAL_1]] : (!quake.measure) -> i1
122122
# CHECK: cc.if(%[[VAL_2]]) {
123123
# CHECK: quake.x %[[VAL_0]] : (!quake.ref) -> ()

0 commit comments

Comments
 (0)