fix: include barriers under OpType

CQCL · Jan 30, 2024 · f8d5e1b · f8d5e1b
1 parent d92d6c0
commit f8d5e1b
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 48 deletions.
diff --git a/phir/model.py b/phir/model.py
@@ -79,6 +79,24 @@ class ExportVar(Data):
 
 DataMgmt: TypeAlias = CVarDefine | QVarDefine | ExportVar
 
+# Meta Instructions
+
+
+class Meta(BaseModel, abc.ABC):
+    """Meta instructions base class."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    meta: str
+
+
+class Barrier(Meta):
+    """Barrier instruction."""
+
+    meta: Literal["barrier"]
+    args: list[Bit]
+
+
 # Operations
 
 
@@ -243,7 +261,7 @@ class MOp(Op):
 
 
 QOp: TypeAlias = MeasOp | SQOp | TQOp
-OpType: TypeAlias = FFCall | COp | QOp | MOp
+OpType: TypeAlias = FFCall | COp | QOp | MOp | Barrier
 
 
 # Blocks
@@ -277,8 +295,8 @@ class IfBlock(Block):
 
     block: Literal["if"]
     condition: COp
-    true_branch: list[OpType]
-    false_branch: list[OpType] | None = None
+    true_branch: list[OpType] | Barrier
+    false_branch: list[OpType] | Barrier | None = None
 
 
 BlockType: TypeAlias = SeqBlock | QParBlock | IfBlock
@@ -295,25 +313,7 @@ class Comment(BaseModel):
     c: str = Field(..., alias="//", min_length=3)
 
 
-# Meta Instructions
-
-
-class Meta(BaseModel, abc.ABC):
-    """Meta instructions base class."""
-
-    model_config = ConfigDict(extra="forbid")
-
-    meta: str
-
-
-class Barrier(Meta):
-    """Barrier instruction."""
-
-    meta: Literal["barrier"]
-    args: list[Bit]
-
-
-Cmd: TypeAlias = DataMgmt | OpType | BlockType | Comment | Barrier
+Cmd: TypeAlias = DataMgmt | OpType | BlockType | Comment
 
 
 class PHIRModel(BaseModel):

diff --git a/schema.json b/schema.json
@@ -389,30 +389,40 @@
           "$ref": "#/$defs/COp"
         },
         "true_branch": {
-          "items": {
-            "anyOf": [
-              {
-                "$ref": "#/$defs/FFCall"
-              },
-              {
-                "$ref": "#/$defs/COp"
-              },
-              {
-                "$ref": "#/$defs/MeasOp"
-              },
-              {
-                "$ref": "#/$defs/SQOp"
-              },
-              {
-                "$ref": "#/$defs/TQOp"
+          "anyOf": [
+            {
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/$defs/FFCall"
+                  },
+                  {
+                    "$ref": "#/$defs/COp"
+                  },
+                  {
+                    "$ref": "#/$defs/MeasOp"
+                  },
+                  {
+                    "$ref": "#/$defs/SQOp"
+                  },
+                  {
+                    "$ref": "#/$defs/TQOp"
+                  },
+                  {
+                    "$ref": "#/$defs/MOp"
+                  },
+                  {
+                    "$ref": "#/$defs/Barrier"
+                  }
+                ]
               },
-              {
-                "$ref": "#/$defs/MOp"
-              }
-            ]
-          },
-          "title": "True Branch",
-          "type": "array"
+              "type": "array"
+            },
+            {
+              "$ref": "#/$defs/Barrier"
+            }
+          ],
+          "title": "True Branch"
         },
         "false_branch": {
           "anyOf": [
@@ -436,11 +446,17 @@
                   },
                   {
                     "$ref": "#/$defs/MOp"
+                  },
+                  {
+                    "$ref": "#/$defs/Barrier"
                   }
                 ]
               },
               "type": "array"
             },
+            {
+              "$ref": "#/$defs/Barrier"
+            },
             {
               "type": "null"
             }
@@ -810,6 +826,9 @@
               {
                 "$ref": "#/$defs/MOp"
               },
+              {
+                "$ref": "#/$defs/Barrier"
+              },
               {
                 "$ref": "#/$defs/SeqBlock"
               },
@@ -1000,6 +1019,9 @@
           {
             "$ref": "#/$defs/MOp"
           },
+          {
+            "$ref": "#/$defs/Barrier"
+          },
           {
             "$ref": "#/$defs/SeqBlock"
           },
@@ -1011,9 +1033,6 @@
           },
           {
             "$ref": "#/$defs/Comment"
-          },
-          {
-            "$ref": "#/$defs/Barrier"
           }
         ]
       },