Skip to content

Conversation

@jackkoenig
Copy link
Contributor

@jackkoenig jackkoenig commented Aug 18, 2021

…(#1944)"

This reverts commit ed894c6.

The fix to #1944 isn't that complicated, but I'm opening this PR to note that currently master is broken if you're using the Emitter.

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you state the API impact?
  • Did you specify the code generation impact?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

API Impact

Backend Code Generation Impact

Desired Merge Strategy

Release Notes

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels?
  • Did you mark the proper milestone (3.2.x, 3.3.x, 3.4.x, 3.5.0) ?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you mark as Please Merge?

@jackkoenig jackkoenig requested a review from sequencer August 18, 2021 00:39
Copy link
Contributor

@ekiwi ekiwi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome. Let's get this in until we have a fix (which should also include a regression test so that we don;t miss something like this again).
Some of my stuff is failing locally, so getting this in would be awesome!

@ekiwi ekiwi added this to the 3.5.0 milestone Aug 18, 2021
@ekiwi ekiwi added the Please Merge Accepted PRs that are ready to be merged. Useful when waiting on CI. label Aug 18, 2021
@mergify mergify bot merged commit 7c8a032 into master Aug 18, 2021
@sequencer
Copy link
Member

Any CI to indicate which codes was broken by #1944? I'll try to fix that, and add corresponding tests.

@ekiwi
Copy link
Contributor

ekiwi commented Aug 18, 2021

Any CI to indicate which codes was broken by #1944? I'll try to fix that, and add corresponding tests.

In ip-contributions these tests failed: https://github.com/freechipsproject/ip-contributions/blob/729c253dcaf540be54dd65bd50567578b59e89d0/src/test/scala/chisel/lib/cordic/iterative/FixedCordicSpec.scala#L56

The error:

Elaborating design...
Done elaborating.
line 1123:37 mismatched input ':' expecting {'circuit', 'module', 'extmodule', 'input', 'output', 'UInt', 'SInt', 'Fixed', '.', 'Clock', 'Analog', '[', 'flip', 'parameter', 'reset', 'wire', 'reg', 'with', 'mem', 'cmem', 'smem', 'mport', 'inst', 'of', 'node', 'is', 'invalid', 'stop(', 'printf(', 'skip', 'attach', 'assert', 'assume', 'cover', 'depth', 'reader', 'writer', 'readwriter', 'when', 'else', 'infer', 'read', 'write', 'rdwr', 'old', 'new', 'undefined', 'mux(', 'validif(', 'stop', 'printf', 'mux', 'validif', 'add(', 'sub(', 'mul(', 'div(', 'rem(', 'lt(', 'leq(', 'gt(', 'geq(', 'eq(', 'neq(', 'pad(', 'asUInt(', 'asAsyncReset(', 'asSInt(', 'asClock(', 'asFixedPoint(', 'asInterval(', 'shl(', 'shr(', 'dshl(', 'dshr(', 'cvt(', 'neg(', 'not(', 'and(', 'or(', 'xor(', 'andr(', 'orr(', 'xorr(', 'cat(', 'bits(', 'head(', 'tail(', 'incp(', 'decp(', 'setp(', 'wrap(', 'clip(', 'squz(', FileInfo, Id, NEWLINE, DEDENT}
line 1572:4 mismatched input 'node' expecting {'circuit', 'module', 'extmodule', 'input', 'output', 'UInt', 'SInt', 'Fixed', '.', 'Clock', 'Analog', '[', 'flip', 'parameter', 'reset', 'wire', 'reg', 'with', 'mem', 'cmem', 'smem', 'mport', 'inst', 'of', 'node', 'is', 'invalid', 'stop(', 'printf(', 'skip', 'attach', 'assert', 'assume', 'cover', 'depth', 'reader', 'writer', 'readwriter', 'when', 'else', 'infer', 'read', 'write', 'rdwr', 'old', 'new', 'undefined', 'mux(', 'validif(', 'stop', 'printf', 'mux', 'validif', 'add(', 'sub(', 'mul(', 'div(', 'rem(', 'lt(', 'leq(', 'gt(', 'geq(', 'eq(', 'neq(', 'pad(', 'asUInt(', 'asAsyncReset(', 'asSInt(', 'asClock(', 'asFixedPoint(', 'asInterval(', 'shl(', 'shr(', 'dshl(', 'dshr(', 'cvt(', 'neg(', 'not(', 'and(', 'or(', 'xor(', 'andr(', 'orr(', 'xorr(', 'cat(', 'bits(', 'head(', 'tail(', 'incp(', 'decp(', 'setp(', 'wrap(', 'clip(', 'squz(', FileInfo, Id, NEWLINE, DEDENT}

@jackkoenig jackkoenig deleted the revert-1944-ir_remove_reginit branch September 1, 2021 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Please Merge Accepted PRs that are ready to be merged. Useful when waiting on CI.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants