luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Elaborate fork-join_none and fork-join_any statements.

This commit is contained in:
Stephen Williams 2012-05-19 17:34:13 -07:00
parent c0f35cbe62
commit 6a57764e0e
12 changed files with 102 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Statement.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998-2008,2010 Stephen Williams (steve@icarus.com) * Copyright (c) 1998-2008,2010,2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -114,6 +114,13 @@ PBlock::~PBlock()
delete list_[idx]; delete list_[idx];
} }
void PBlock::set_join_type(PBlock::BL_TYPE type)
{
assert(bl_type_ == BL_PAR);
assert(type == BL_JOIN_NONE || type==BL_JOIN_ANY);
bl_type_ = type;
}
void PBlock::set_statement(const vector<Statement*>&st) void PBlock::set_statement(const vector<Statement*>&st)
{ {
list_ = st; list_ = st;

10
Statement.h
View File

@ -1,7 +1,7 @@
#ifndef __Statement_H #ifndef __Statement_H
#define __Statement_H #define __Statement_H
/* /*
* Copyright (c) 1998-2008 Stephen Williams (steve@icarus.com) * Copyright (c) 1998-2008,2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -165,7 +165,7 @@ class PAssignNB : public PAssign_ {
class PBlock : public PScope, public Statement { class PBlock : public PScope, public Statement {
public: public:
enum BL_TYPE { BL_SEQ, BL_PAR }; enum BL_TYPE { BL_SEQ, BL_PAR, BL_JOIN_NONE, BL_JOIN_ANY };
// If the block has a name, it is a scope and also has a parent. // If the block has a name, it is a scope and also has a parent.
explicit PBlock(perm_string n, LexicalScope*parent, BL_TYPE t); explicit PBlock(perm_string n, LexicalScope*parent, BL_TYPE t);
@ -175,6 +175,10 @@ class PBlock : public PScope, public Statement {
BL_TYPE bl_type() const { return bl_type_; } BL_TYPE bl_type() const { return bl_type_; }
// If the bl_type() is BL_PAR, it is possible to replace it
// with JOIN_NONE or JOIN_ANY. This is to help the parser.
void set_join_type(BL_TYPE);
void set_statement(const std::vector<Statement*>&st); void set_statement(const std::vector<Statement*>&st);
virtual void dump(ostream&out, unsigned ind) const; virtual void dump(ostream&out, unsigned ind) const;
@ -183,7 +187,7 @@ class PBlock : public PScope, public Statement {
virtual void elaborate_sig(Design*des, NetScope*scope) const; virtual void elaborate_sig(Design*des, NetScope*scope) const;
private: private:
const BL_TYPE bl_type_; BL_TYPE bl_type_;
std::vector<Statement*>list_; std::vector<Statement*>list_;
}; };

6
design_dump.cc
View File

@ -40,6 +40,12 @@ static ostream& operator<< (ostream&o, NetBlock::Type t)
case NetBlock::PARA: case NetBlock::PARA:
o << "fork"; o << "fork";
break; break;
case NetBlock::PARA_JOIN_NONE:
o << "fork-join_none";
break;
case NetBlock::PARA_JOIN_ANY:
o << "fork-join_any";
break;
} }
return o; return o;
} }

4
elab_scope.cc
View File

@ -1564,7 +1564,9 @@ void PBlock::elaborate_scope(Design*des, NetScope*scope) const
<< "Elaborate block scope " << use_name << "Elaborate block scope " << use_name
<< " within " << scope_path(scope) << endl; << " within " << scope_path(scope) << endl;
my_scope = new NetScope(scope, use_name, bl_type_==BL_PAR // The scope type is begin-end or fork-join. The
// sub-types of fork-join are not interesting to the scope.
my_scope = new NetScope(scope, use_name, bl_type_!=BL_SEQ
? NetScope::FORK_JOIN ? NetScope::FORK_JOIN
: NetScope::BEGIN_END); : NetScope::BEGIN_END);
my_scope->set_line(get_file(), get_lineno()); my_scope->set_line(get_file(), get_lineno());

18
elaborate.cc
View File

@ -2633,9 +2633,21 @@ NetProc* PBlock::elaborate(Design*des, NetScope*scope) const
{ {
assert(scope); assert(scope);
NetBlock::Type type = (bl_type_==PBlock::BL_PAR) NetBlock::Type type;
? NetBlock::PARA switch (bl_type_) {
: NetBlock::SEQU; case PBlock::BL_SEQ:
type = NetBlock::SEQU;
break;
case PBlock::BL_PAR:
type = NetBlock::PARA;
break;
case PBlock::BL_JOIN_NONE:
type = NetBlock::PARA_JOIN_NONE;
break;
case PBlock::BL_JOIN_ANY:
type = NetBlock::PARA_JOIN_ANY;
break;
}
NetScope*nscope = 0; NetScope*nscope = 0;
if (pscope_name() != 0) { if (pscope_name() != 0) {

10
ivl_target.h
View File

@ -1,7 +1,7 @@
#ifndef __ivl_target_H #ifndef __ivl_target_H
#define __ivl_target_H #define __ivl_target_H
/* /*
* Copyright (c) 2000-2011 Stephen Williams (steve@icarus.com) * Copyright (c) 2000-2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -406,6 +406,8 @@ typedef enum ivl_statement_type_e {
IVL_ST_FORCE = 14, IVL_ST_FORCE = 14,
IVL_ST_FOREVER = 15, IVL_ST_FOREVER = 15,
IVL_ST_FORK = 16, IVL_ST_FORK = 16,
IVL_ST_FORK_JOIN_ANY = 28,
IVL_ST_FORK_JOIN_NONE = 29,
IVL_ST_FREE = 26, IVL_ST_FREE = 26,
IVL_ST_RELEASE = 17, IVL_ST_RELEASE = 17,
IVL_ST_REPEAT = 18, IVL_ST_REPEAT = 18,
@ -2069,11 +2071,11 @@ extern unsigned ivl_stmt_lineno(ivl_statement_t net);
* triggers. The statement waits even if the sub-statement is nul. * triggers. The statement waits even if the sub-statement is nul.
*/ */
/* IVL_ST_BLOCK, IVL_ST_FORK */ /* IVL_ST_BLOCK, IVL_ST_FORK, IVL_ST_FORK_JOIN_ANY, IVL_ST_FORK_JOIN_NONE */
extern unsigned ivl_stmt_block_count(ivl_statement_t net); extern unsigned ivl_stmt_block_count(ivl_statement_t net);
/* IVL_ST_BLOCK, IVL_ST_FORK */ /* IVL_ST_BLOCK, IVL_ST_FORK, IVL_ST_FORK_JOIN_ANY, IVL_ST_FORK_JOIN_NONE */
extern ivl_scope_t ivl_stmt_block_scope(ivl_statement_t net); extern ivl_scope_t ivl_stmt_block_scope(ivl_statement_t net);
/* IVL_ST_BLOCK, IVL_ST_FORK */ /* IVL_ST_BLOCK, IVL_ST_FORK, IVL_ST_FORK_JOIN_ANY, IVL_ST_FORK_JOIN_NONE */
extern ivl_statement_t ivl_stmt_block_stmt(ivl_statement_t net, unsigned i); extern ivl_statement_t ivl_stmt_block_stmt(ivl_statement_t net, unsigned i);
/* IVL_ST_UTASK IVL_ST_DISABLE */ /* IVL_ST_UTASK IVL_ST_DISABLE */
extern ivl_scope_t ivl_stmt_call(ivl_statement_t net); extern ivl_scope_t ivl_stmt_call(ivl_statement_t net);

4
net_nex_input.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002-2011 Stephen Williams (steve@icarus.com) * Copyright (c) 2002-2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -257,7 +257,7 @@ NexusSet* NetBlock::nex_input(bool rem_out)
if (last_ == 0) if (last_ == 0)
return new NexusSet; return new NexusSet;
if (type_ == PARA) { if (type_ != SEQU) {
cerr << get_fileline() << ": internal error: Sorry, " cerr << get_fileline() << ": internal error: Sorry, "
<< "I don't know how to synthesize fork/join blocks." << "I don't know how to synthesize fork/join blocks."
<< endl; << endl;

2
netlist.h
View File

@ -2491,7 +2491,7 @@ class NetAssignNB : public NetAssignBase {
class NetBlock : public NetProc { class NetBlock : public NetProc {
public: public:
enum Type { SEQU, PARA }; enum Type { SEQU, PARA, PARA_JOIN_ANY, PARA_JOIN_NONE };
NetBlock(Type t, NetScope*subscope); NetBlock(Type t, NetScope*subscope);
~NetBlock(); ~NetBlock();

13
parse.y
View File

@ -356,6 +356,7 @@ static void current_function_set_statement(const YYLTYPE&loc, vector<Statement*>
PGBuiltin::Type gatetype; PGBuiltin::Type gatetype;
NetNet::PortType porttype; NetNet::PortType porttype;
ivl_variable_type_t vartype; ivl_variable_type_t vartype;
PBlock::BL_TYPE join_keyword;
PWire*wire; PWire*wire;
svector<PWire*>*wires; svector<PWire*>*wires;
@ -574,6 +575,8 @@ static void current_function_set_statement(const YYLTYPE&loc, vector<Statement*>
%type <statement> analog_statement %type <statement> analog_statement
%type <join_keyword> join_keyword
%type <letter> spec_polarity %type <letter> spec_polarity
%type <perm_strings> specify_path_identifiers %type <perm_strings> specify_path_identifiers
@ -1084,10 +1087,11 @@ integer_vector_type /* IEEE1800-2005: A.2.2.1 */
join_keyword /* IEEE1800-2005: A.6.3 */ join_keyword /* IEEE1800-2005: A.6.3 */
: K_join : K_join
{ $$ = PBlock::BL_PAR; }
| K_join_none | K_join_none
{ yyerror(@1, "sorry: join_none not supported."); } { $$ = PBlock::BL_JOIN_NONE; }
| K_join_any | K_join_any
{ yyerror(@1, "sorry: join_any not supported."); } { $$ = PBlock::BL_JOIN_ANY; }
; ;
jump_statement /* IEEE1800-2005: A.6.5 */ jump_statement /* IEEE1800-2005: A.6.5 */
@ -5335,12 +5339,12 @@ statement_item /* This is roughly statement_item in the LRM */
code generator can do the right thing. */ code generator can do the right thing. */
| K_fork join_keyword | K_fork join_keyword
{ PBlock*tmp = new PBlock(PBlock::BL_PAR); { PBlock*tmp = new PBlock($2);
FILE_NAME(tmp, @1); FILE_NAME(tmp, @1);
$$ = tmp; $$ = tmp;
} }
| K_fork statement_or_null_list join_keyword | K_fork statement_or_null_list join_keyword
{ PBlock*tmp = new PBlock(PBlock::BL_PAR); { PBlock*tmp = new PBlock($3);
FILE_NAME(tmp, @1); FILE_NAME(tmp, @1);
tmp->set_statement(*$2); tmp->set_statement(*$2);
delete $2; delete $2;
@ -5357,6 +5361,7 @@ statement_item /* This is roughly statement_item in the LRM */
assert(! current_block_stack.empty()); assert(! current_block_stack.empty());
PBlock*tmp = current_block_stack.top(); PBlock*tmp = current_block_stack.top();
current_block_stack.pop(); current_block_stack.pop();
tmp->set_join_type($7);
if ($6) tmp->set_statement(*$6); if ($6) tmp->set_statement(*$6);
delete[]$3; delete[]$3;
delete $6; delete $6;

8
t-dll-api.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000-2011 Stephen Williams (steve@icarus.com) * Copyright (c) 2000-2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -2271,6 +2271,8 @@ extern "C" ivl_scope_t ivl_stmt_block_scope(ivl_statement_t net)
switch (net->type_) { switch (net->type_) {
case IVL_ST_BLOCK: case IVL_ST_BLOCK:
case IVL_ST_FORK: case IVL_ST_FORK:
case IVL_ST_FORK_JOIN_ANY:
case IVL_ST_FORK_JOIN_NONE:
return net->u_.block_.scope; return net->u_.block_.scope;
default: default:
assert(0); assert(0);
@ -2283,6 +2285,8 @@ extern "C" unsigned ivl_stmt_block_count(ivl_statement_t net)
switch (net->type_) { switch (net->type_) {
case IVL_ST_BLOCK: case IVL_ST_BLOCK:
case IVL_ST_FORK: case IVL_ST_FORK:
case IVL_ST_FORK_JOIN_ANY:
case IVL_ST_FORK_JOIN_NONE:
return net->u_.block_.nstmt_; return net->u_.block_.nstmt_;
default: default:
assert(0); assert(0);
@ -2296,6 +2300,8 @@ extern "C" ivl_statement_t ivl_stmt_block_stmt(ivl_statement_t net,
switch (net->type_) { switch (net->type_) {
case IVL_ST_BLOCK: case IVL_ST_BLOCK:
case IVL_ST_FORK: case IVL_ST_FORK:
case IVL_ST_FORK_JOIN_ANY:
case IVL_ST_FORK_JOIN_NONE:
return net->u_.block_.stmt_ + i; return net->u_.block_.stmt_ + i;
default: default:
assert(0); assert(0);

19
t-dll-proc.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000-2011 Stephen Williams (steve@icarus.com) * Copyright (c) 2000-2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -386,9 +386,20 @@ bool dll_target::proc_block(const NetBlock*net)
it, so fill in the block fields of the existing statement, it, so fill in the block fields of the existing statement,
and generate the contents for the statement array. */ and generate the contents for the statement array. */
stmt_cur_->type_ = (net->type() == NetBlock::SEQU) switch (net->type()) {
? IVL_ST_BLOCK case NetBlock::SEQU:
: IVL_ST_FORK; stmt_cur_->type_ = IVL_ST_BLOCK;
break;
case NetBlock::PARA:
stmt_cur_->type_ = IVL_ST_FORK;
break;
case NetBlock::PARA_JOIN_ANY:
stmt_cur_->type_ = IVL_ST_FORK_JOIN_ANY;
break;
case NetBlock::PARA_JOIN_NONE:
stmt_cur_->type_ = IVL_ST_FORK_JOIN_NONE;
break;
}
stmt_cur_->u_.block_.nstmt_ = count; stmt_cur_->u_.block_.nstmt_ = count;
stmt_cur_->u_.block_.stmt_ = (struct ivl_statement_s*) stmt_cur_->u_.block_.stmt_ = (struct ivl_statement_s*)
calloc(count, sizeof(struct ivl_statement_s)); calloc(count, sizeof(struct ivl_statement_s));

24
tgt-stub/statement.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2007 Stephen Williams (steve@icarus.com) * Copyright (c) 2004-2007,2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -329,6 +329,28 @@ void show_statement(ivl_statement_t net, unsigned ind)
break; break;
} }
case IVL_ST_FORK_JOIN_ANY: {
unsigned cnt = ivl_stmt_block_count(net);
fprintf(out, "%*sfork\n", ind, "");
for (idx = 0 ; idx < cnt ; idx += 1) {
ivl_statement_t cur = ivl_stmt_block_stmt(net, idx);
show_statement(cur, ind+4);
}
fprintf(out, "%*sjoin_any\n", ind, "");
break;
}
case IVL_ST_FORK_JOIN_NONE: {
unsigned cnt = ivl_stmt_block_count(net);
fprintf(out, "%*sfork\n", ind, "");
for (idx = 0 ; idx < cnt ; idx += 1) {
ivl_statement_t cur = ivl_stmt_block_stmt(net, idx);
show_statement(cur, ind+4);
}
fprintf(out, "%*sjoin_none\n", ind, "");
break;
}
case IVL_ST_FREE: case IVL_ST_FREE:
fprintf(out, "%*sfree automatic storage ...\n", ind, ""); fprintf(out, "%*sfree automatic storage ...\n", ind, "");
break; break;