Merge pull request #33 from BBN-Q/fix/label-repeat

LoadRepeat should come before the loop label

QGL/drivers/APS2Pattern.py

@@ -541,6 +541,7 @@ def create_seq_instructions(seqs, offsets):
 		# 3. SET_PHASE should happen after RESET_PHASE
 		# 4. instructions to different engines should have single write flag
 		# 5. labels should be moved to the first instruction
+		# 6. LoadRepeat should be moved before the label for the repeated instructions
 		def find_and_pop_entries(predicate):
 			matched = []
 			for ct, entry in enumerate(entries):
@@ -550,6 +551,7 @@ def find_and_pop_entries(predicate):
 
 		if len(entries) > 1:
 			#reorder
+			load_entry = find_and_pop_entries(lambda e: isinstance(e[0], ControlFlow.LoadRepeat))
 			label_entry = find_and_pop_entries(lambda e: isinstance(e[0], BlockLabel.BlockLabel))
 			sync_entry = find_and_pop_entries(lambda e: isinstance(e[0], ControlFlow.Sync))
 			trig_entry = find_and_pop_entries(lambda e: isinstance(e[0], ControlFlow.Wait))
@@ -558,7 +560,7 @@ def find_and_pop_entries(predicate):
 			frame_entry = find_and_pop_entries(lambda e: isinstance(e[0], ModulationCommand) and e[0].instruction == "UPDATE_FRAME")
 			phase_entry = find_and_pop_entries(lambda e: isinstance(e[0], ModulationCommand) and e[0].instruction == "SET_PHASE")
 			freq_entry = find_and_pop_entries(lambda e: isinstance(e[0], ModulationCommand) and e[0].instruction == "SET_FREQ")
-			reordered_entries = label_entry + sync_entry + control_flow_entries + reset_entry + phase_entry + freq_entry + frame_entry + trig_entry
+			reordered_entries = load_entry + label_entry + sync_entry + control_flow_entries + reset_entry + phase_entry + freq_entry + frame_entry + trig_entry
 			write_flags = [True]*len(reordered_entries)
 			for entry in entries:
 				reordered_entries.append(entry)