Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/decompnet/app/engine/autopilot.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,18 +275,24 @@ def _autopilot_one_work(self, agent, proj, fid: int) -> str:
from ..return_repair_autopilot import run as return_repair
if return_repair(self, agent, proj, fn):
return 'match'
seed = self._seed_for(fn, proj) # keep one valid-syntax draft for the brief and the compiler
ctx = self._context(proj["id"], fn["unit"])
plan, toolchain, context = self._draft_plan(fn, proj, ctx=ctx)
own = compiler_for(self.cfg(proj), fn["vram"], fn)
data_asm = "\n".join(self._jtbl_asm(proj, fn))
target_asm = self._asm_text(fn, proj)
from .. import draft_reports, initial_draft_repairs
input_key = draft_reports.key(plan, ctx['header'], data_asm, fn)
previous = draft_reports.read(self, fid, project_id=proj['id'])
external_inputs = own.get('cmd') or own.get('ro_paths') or any(flag.startswith(('-I','-include','-imacros')) for flag in own.get('flags',[]))
if not external_inputs and previous.get('key') == input_key and previous.get('complete'):
return 'skip'
target_asm = self._asm_text(fn, proj)
# Eligibility is known before any generation. Reuse this exact captured
# plan and assembly rather than calculating them again inside _seed_for.
seed = self._seed_for(fn, proj, (plan, toolchain, context, data_asm, target_asm))
if not seed:
# Seed preparation may have just recorded a generation failure.
# Reuse that receipt instead of immediately repeating failed m2c.
previous = draft_reports.read(self, fid, project_id=proj['id'])
data_key = hashlib.sha256((data_asm or '').encode()).hexdigest()
report = {'key': input_key, 'seed_key':plan, 'data_key':data_key, 'compiled': False, 'scored': False, 'matched': False, 'trials': 0, 'failures': []}
from .briefs import DRAFT_NOTE
Expand Down
17 changes: 12 additions & 5 deletions src/decompnet/app/engine/briefs.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,31 +139,38 @@ def _draft_plan(self, fn, proj, names=None, ctx=None) -> tuple[str, str, str]:
key = hashlib.sha1(json.dumps(inputs).encode()).hexdigest()[:16]
return key, own["toolchain"], context

def _seed_for(self, fn, proj) -> str | None:
def _seed_for(self, fn, proj, prepared=None) -> str | None:
"""m2c draft, made the first time someone opens the function or the background drafter gets to it, and again
when what it's made from changed (_draft_plan). Drafts of different functions are made side by side: one lock
for the whole app made agents claiming at once wait for each other's drafts, about 0.3 s each."""
if not seeds.available():
return fn["seed"]
key, toolchain, context = self._draft_plan(fn, proj)
if prepared is None:
key, toolchain, context = self._draft_plan(fn, proj)
else:
key, toolchain, context, _, _ = prepared
if fn["seed"] is not None and fn["seed_key"] == key:
return fn["seed"]
with self._draft_locks.setdefault(fn["id"], threading.Lock()):
row = self.project_store(proj['id']).one("SELECT seed, seed_key FROM functions WHERE id=?", fn["id"])
if row is None or (row["seed"] is not None and row["seed_key"] == key): # made meanwhile
return row["seed"] if row else None
data_asm = "\n".join(self._jtbl_asm(proj, fn))
if prepared is None:
data_asm = "\n".join(self._jtbl_asm(proj, fn))
target_asm = self._asm_text(fn, proj)
else:
_, _, _, data_asm, target_asm = prepared
from .. import draft_reports
report = {'seed_key':key, 'compiled':False, 'failures':[]}
try:
draft = seeds.generate_from_asm(self._asm_text(fn, proj), fn['name'], toolchain, context, data_asm,
draft = seeds.generate_from_asm(target_asm, fn['name'], toolchain, context, data_asm,
valid=True, strict=True, timeout=20)
except seeds.DraftError as error:
draft_reports.failure(report, 'generation', 'raw_m2c', error)
draft = None
if context.strip():
try:
draft = seeds.generate_from_asm(self._asm_text(fn, proj), fn['name'], toolchain, '', data_asm,
draft = seeds.generate_from_asm(target_asm, fn['name'], toolchain, '', data_asm,
valid=True, strict=True, timeout=20)
except seeds.DraftError as fallback_error:
draft_reports.failure(report, 'generation', 'without_context', fallback_error)
Expand Down
31 changes: 31 additions & 0 deletions tests/test_initial_drafts.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,3 +345,34 @@ def progress(self, data):
assert snapshots[-1]['done'] == snapshots[-1]['total'] == 1
assert snapshots[-1]['function'] == ''
assert snapshots[-1]['compiled'] == result['compiled'] == 1


def test_seed_uses_prepared_inputs_without_replanning(network,monkeypatch): # noqa: F811
net,proj,fn=network
monkeypatch.setattr(seeds,'available',lambda:True)
monkeypatch.setattr(net,'_draft_plan',lambda *a,**kw:pytest.fail('must use captured plan'))
monkeypatch.setattr(net,'_jtbl_asm',lambda *a:pytest.fail('must use captured data'))
monkeypatch.setattr(net,'_asm_text',lambda *a:pytest.fail('must use captured assembly'))
calls=[]
def generate(*args,**kw):
calls.append(args)
return 'int '+fn['name']+'(void){return 1;}'
monkeypatch.setattr(seeds,'generate_from_asm',generate)
prepared=('captured-key','gcc-2.7.2-kmc','captured header','captured data','captured assembly')
seed=net._seed_for(fn,proj,prepared)
assert seed and len(calls)==1
assert calls[0]==('captured assembly',fn['name'],'gcc-2.7.2-kmc','captured header','captured data')


def test_completed_autopilot_receipt_skips_seed_preparation(network,monkeypatch): # noqa: F811
net,proj,fn=network
from decompnet.app import return_repair_autopilot
monkeypatch.setattr(return_repair_autopilot,'run',lambda *a:False)
monkeypatch.setattr(net,'_draft_plan',lambda *a,**kw:('same-plan','gcc-2.7.2-kmc',''))
monkeypatch.setattr(net,'_jtbl_asm',lambda *a:[])
monkeypatch.setattr(net,'_seed_for',lambda *a:pytest.fail('unchanged completion must skip seed preparation'))
ctx=net._context(proj['id'],fn['unit'])
key=draft_reports.key('same-plan',ctx['header'],'',fn)
draft_reports.save(net,fn['id'],{'key':key,'complete':True},project_id=proj['id'])
agent,_=net.local_agent('autopilot')
assert net._autopilot_one_work(agent,proj,fn['id'])=='skip'
Loading