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

Cleanup lxt2 writer with version from gtkwave 1.2.31

This commit is contained in:
steve 2003-09-23 03:40:59 +00:00
parent d1f0bcf620
commit 2f8181f40a
2 changed files with 138 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
vpi/lxt2_write.c
View File

@ -52,10 +52,10 @@ for(;;s++)
/************************ splay ************************/ /************************ splay ************************/
static ds_Tree * ds_splay (granmsk_t i, ds_Tree * t) { static lxt2_wr_ds_Tree * lxt2_wr_ds_splay (granmsk_t i, lxt2_wr_ds_Tree * t) {
/* Simple top down splay, not requiring i to be in the tree t. */ /* Simple top down splay, not requiring i to be in the tree t. */
/* What it does is described above. */ /* What it does is described above. */
ds_Tree N, *l, *r, *y; lxt2_wr_ds_Tree N, *l, *r, *y;
if (t == NULL) return t; if (t == NULL) return t;
N.left = N.right = NULL; N.left = N.right = NULL;
l = r = &N; l = r = &N;
@ -97,12 +97,12 @@ static ds_Tree * ds_splay (granmsk_t i, ds_Tree * t) {
} }
static ds_Tree * ds_insert(granmsk_t i, ds_Tree * t, int val) { static lxt2_wr_ds_Tree * lxt2_wr_ds_insert(granmsk_t i, lxt2_wr_ds_Tree * t, int val) {
/* Insert i into the tree t, unless it's already there. */ /* Insert i into the tree t, unless it's already there. */
/* Return a pointer to the resulting tree. */ /* Return a pointer to the resulting tree. */
ds_Tree * n; lxt2_wr_ds_Tree * n;
n = (ds_Tree *) calloc (1, sizeof (ds_Tree)); n = (lxt2_wr_ds_Tree *) calloc (1, sizeof (lxt2_wr_ds_Tree));
if (n == NULL) { if (n == NULL) {
fprintf(stderr, "ds_insert: ran out of memory, exiting.\n"); fprintf(stderr, "ds_insert: ran out of memory, exiting.\n");
exit(255); exit(255);
@ -113,7 +113,7 @@ static ds_Tree * ds_insert(granmsk_t i, ds_Tree * t, int val) {
n->left = n->right = NULL; n->left = n->right = NULL;
return n; return n;
} }
t = ds_splay(i,t); t = lxt2_wr_ds_splay(i,t);
if (i < t->item) { if (i < t->item) {
n->left = t->left; n->left = t->left;
n->right = t; n->right = t;
@ -133,15 +133,15 @@ static ds_Tree * ds_insert(granmsk_t i, ds_Tree * t, int val) {
/************************ splay ************************/ /************************ splay ************************/
static int dslxt_success; static int lxt2_wr_dslxt_success;
static dslxt_Tree * dslxt_splay (char *i, dslxt_Tree * t) { static lxt2_wr_dslxt_Tree * lxt2_wr_dslxt_splay (char *i, lxt2_wr_dslxt_Tree * t) {
/* Simple top down splay, not requiring i to be in the tree t. */ /* Simple top down splay, not requiring i to be in the tree t. */
/* What it does is described above. */ /* What it does is described above. */
dslxt_Tree N, *l, *r, *y; lxt2_wr_dslxt_Tree N, *l, *r, *y;
int dir; int dir;
dslxt_success = 0; lxt2_wr_dslxt_success = 0;
if (t == NULL) return t; if (t == NULL) return t;
N.left = N.right = NULL; N.left = N.right = NULL;
@ -174,7 +174,7 @@ static dslxt_Tree * dslxt_splay (char *i, dslxt_Tree * t) {
l = t; l = t;
t = t->right; t = t->right;
} else { } else {
dslxt_success=1; lxt2_wr_dslxt_success=1;
break; break;
} }
} }
@ -186,13 +186,13 @@ static dslxt_Tree * dslxt_splay (char *i, dslxt_Tree * t) {
} }
static dslxt_Tree * dslxt_insert(char *i, dslxt_Tree * t, unsigned int val) { static lxt2_wr_dslxt_Tree * lxt2_wr_dslxt_insert(char *i, lxt2_wr_dslxt_Tree * t, unsigned int val) {
/* Insert i into the tree t, unless it's already there. */ /* Insert i into the tree t, unless it's already there. */
/* Return a pointer to the resulting tree. */ /* Return a pointer to the resulting tree. */
dslxt_Tree * n; lxt2_wr_dslxt_Tree * n;
int dir; int dir;
n = (dslxt_Tree *) calloc (1, sizeof (dslxt_Tree)); n = (lxt2_wr_dslxt_Tree *) calloc (1, sizeof (lxt2_wr_dslxt_Tree));
if (n == NULL) { if (n == NULL) {
fprintf(stderr, "dslxt_insert: ran out of memory, exiting.\n"); fprintf(stderr, "dslxt_insert: ran out of memory, exiting.\n");
exit(255); exit(255);
@ -203,7 +203,7 @@ static dslxt_Tree * dslxt_insert(char *i, dslxt_Tree * t, unsigned int val) {
n->left = n->right = NULL; n->left = n->right = NULL;
return n; return n;
} }
t = dslxt_splay(i,t); t = lxt2_wr_dslxt_splay(i,t);
dir = strcmp(i,t->item); dir = strcmp(i,t->item);
if (dir<0) { if (dir<0) {
n->left = t->left; n->left = t->left;
@ -540,7 +540,7 @@ if((lt)&&(lt->numfacs))
{ {
struct lxt2_wr_symbol *s = lt->symchain; struct lxt2_wr_symbol *s = lt->symchain;
struct lxt2_wr_symbol **aliascache = calloc(lt->numalias, sizeof(struct lxt2_wr_symbol *)); struct lxt2_wr_symbol **aliascache = calloc(lt->numalias, sizeof(struct lxt2_wr_symbol *));
int aliases_encountered = 0, facs_encountered = 0; int aliases_encountered, facs_encountered;
lt->sorted_facs = (struct lxt2_wr_symbol **)calloc(lt->numfacs, sizeof(struct lxt2_wr_symbol *)); lt->sorted_facs = (struct lxt2_wr_symbol **)calloc(lt->numfacs, sizeof(struct lxt2_wr_symbol *));
@ -561,7 +561,39 @@ if((lt)&&(lt->numfacs))
} }
qsort((void *)lt->sorted_facs, lt->numfacs, sizeof(struct lxt2_wr_symbol *), lxt2_wr_compare); qsort((void *)lt->sorted_facs, lt->numfacs, sizeof(struct lxt2_wr_symbol *), lxt2_wr_compare);
if(lt->partial_preference)
{
/* move preferenced facs up */
struct lxt2_wr_symbol **prefcache = aliascache;
int prefs_encountered = 0;
facs_encountered = 0;
for(i=0;i<lt->numfacs;i++)
{
if((lt->sorted_facs[i]->partial_preference)==0)
{
lt->sorted_facs[facs_encountered] = lt->sorted_facs[i];
facs_encountered++;
}
else
{
prefcache[prefs_encountered] = lt->sorted_facs[i];
prefs_encountered++;
}
}
/* then append the non-preferenced facs */
for(i=0;i<facs_encountered;i++)
{
prefcache[prefs_encountered+i] = lt->sorted_facs[i];
}
/* now make prefcache the main cache */
aliascache = lt->sorted_facs;
lt->sorted_facs = prefcache;
}
/* move facs up */ /* move facs up */
aliases_encountered = 0, facs_encountered = 0;
for(i=0;i<lt->numfacs;i++) for(i=0;i<lt->numfacs;i++)
{ {
if((lt->sorted_facs[i]->flags&LXT2_WR_SYM_F_ALIAS)==0) if((lt->sorted_facs[i]->flags&LXT2_WR_SYM_F_ALIAS)==0)
@ -705,6 +737,45 @@ if(lt)
} }
} }
void lxt2_wr_set_partial_preference(struct lxt2_wr_trace *lt, const char *name)
{
struct lxt2_wr_symbol *s;
if((lt)&&(name)&&(!lt->sorted_facs))
{
s=lxt2_wr_symfind(lt, name);
if(s)
{
while(s->aliased_to) /* find root alias */
{
s=s->aliased_to;
}
s->partial_preference = 1;
}
}
}
/*
* enable/disable checkpointing (for smaller files)
*/
void lxt2_wr_set_checkpoint_off(struct lxt2_wr_trace *lt)
{
if(lt)
{
lt->no_checkpoint = 1;
}
}
void lxt2_wr_set_checkpoint_on(struct lxt2_wr_trace *lt)
{
if(lt)
{
lt->no_checkpoint = 0;
}
}
/* /*
* set initial value of trace (0, 1, x, z) only legal vals * set initial value of trace (0, 1, x, z) only legal vals
@ -940,10 +1011,10 @@ for(j=iter;j<iter_hi;j++)
{ {
granmsk_t msk = lt->sorted_facs[j]->msk; granmsk_t msk = lt->sorted_facs[j]->msk;
lt->mapdict = ds_splay (msk, lt->mapdict); lt->mapdict = lxt2_wr_ds_splay (msk, lt->mapdict);
if((!lt->mapdict)||(lt->mapdict->item != msk)) if((!lt->mapdict)||(lt->mapdict->item != msk))
{ {
lt->mapdict = ds_insert(msk, lt->mapdict, lt->num_map_entries); lt->mapdict = lxt2_wr_ds_insert(msk, lt->mapdict, lt->num_map_entries);
lt->num_map_entries++; lt->num_map_entries++;
if(lt->mapdict_curr) if(lt->mapdict_curr)
@ -1022,7 +1093,7 @@ for(j=iter;j<iter_hi;j++)
{ {
unsigned int val; unsigned int val;
s=lt->sorted_facs[j]; s=lt->sorted_facs[j];
lt->mapdict = ds_splay (s->msk, lt->mapdict); lt->mapdict = lxt2_wr_ds_splay (s->msk, lt->mapdict);
val = lt->mapdict->val; val = lt->mapdict->val;
switch(map_nbytes) switch(map_nbytes)
@ -1084,8 +1155,8 @@ lt->timegranule++;
if((lt->timegranule>=lt->maxgranule)||(do_finalize)) if((lt->timegranule>=lt->maxgranule)||(do_finalize))
{ {
unsigned int unclen, clen; unsigned int unclen, clen;
ds_Tree *dt, *dt2; lxt2_wr_ds_Tree *dt, *dt2;
dslxt_Tree *ds, *ds2; lxt2_wr_dslxt_Tree *ds, *ds2;
if(using_partial_zip) if(using_partial_zip)
{ {
@ -1204,8 +1275,10 @@ if((lt->timegranule>=lt->maxgranule)||(do_finalize))
lxt2_wr_emit_u64(lt, (lt->lasttime>>32)&0xffffffff, lt->lasttime&0xffffffff); lxt2_wr_emit_u64(lt, (lt->lasttime>>32)&0xffffffff, lt->lasttime&0xffffffff);
/* fprintf(stderr, "start: %Ld, end %Ld\n", lt->firsttime, lt->lasttime); */ /* fprintf(stderr, "start: %Ld, end %Ld\n", lt->firsttime, lt->lasttime); */
lt->timegranule=0; lt->timegranule=0;
}; lt->numblock++;
}
if(do_finalize) if(do_finalize)
{ {
@ -1258,12 +1331,15 @@ if(lt)
lt->timetable[lt->timepos] = timeval; lt->timetable[lt->timepos] = timeval;
} }
if((!lt->timepos)&&(!lt->timegranule)) if( (!lt->timepos) && (!lt->timegranule) )
{ {
struct lxt2_wr_symbol *s = lt->symchain;
lt->firsttime = timeval; lt->firsttime = timeval;
lt->lasttime = timeval; lt->lasttime = timeval;
}
if( (!lt->timepos) && (!lt->timegranule) && ((!lt->numblock)||(!lt->no_checkpoint)) )
{
struct lxt2_wr_symbol *s = lt->symchain;
/* fprintf(stderr, "initial value burst timepos==0, timegranule==0\n"); */ /* fprintf(stderr, "initial value burst timepos==0, timegranule==0\n"); */
if(lt->blackout) if(lt->blackout)
@ -1414,15 +1490,15 @@ if(s->flags&LXT2_WR_SYM_F_DOUBLE)
free(s->value); free(s->value);
s->value = strdup(d_buf); s->value = strdup(d_buf);
lt->dict = dslxt_splay (s->value, lt->dict); lt->dict = lxt2_wr_dslxt_splay (s->value, lt->dict);
if(!dslxt_success) if(!lxt2_wr_dslxt_success)
{ {
unsigned int vlen = strlen(d_buf)+1; unsigned int vlen = strlen(d_buf)+1;
char *vcopy = (char *)malloc(vlen); char *vcopy = (char *)malloc(vlen);
strcpy(vcopy, d_buf); strcpy(vcopy, d_buf);
lt->dict_string_mem_required += vlen; lt->dict_string_mem_required += vlen;
lt->dict = dslxt_insert(vcopy, lt->dict, lt->num_dict_entries); lt->dict = lxt2_wr_dslxt_insert(vcopy, lt->dict, lt->num_dict_entries);
if(lt->dict_curr) if(lt->dict_curr)
{ {
@ -1494,15 +1570,15 @@ if(s->flags&LXT2_WR_SYM_F_STRING)
free(s->value); free(s->value);
s->value = strdup(value); s->value = strdup(value);
lt->dict = dslxt_splay (s->value, lt->dict); lt->dict = lxt2_wr_dslxt_splay (s->value, lt->dict);
if(!dslxt_success) if(!lxt2_wr_dslxt_success)
{ {
unsigned int vlen = strlen(value)+1; unsigned int vlen = strlen(value)+1;
char *vcopy = (char *)malloc(vlen); char *vcopy = (char *)malloc(vlen);
strcpy(vcopy, value); strcpy(vcopy, value);
lt->dict_string_mem_required += vlen; lt->dict_string_mem_required += vlen;
lt->dict = dslxt_insert(vcopy, lt->dict, lt->num_dict_entries); lt->dict = lxt2_wr_dslxt_insert(vcopy, lt->dict, lt->num_dict_entries);
if(lt->dict_curr) if(lt->dict_curr)
{ {
@ -1716,15 +1792,15 @@ if(!(s->flags&(LXT2_WR_SYM_F_DOUBLE|LXT2_WR_SYM_F_STRING)))
idxchk: if(idx<0) idxchk: if(idx<0)
{ {
vpnt = lxt2_wr_vcd_truncate_bitvec(value); vpnt = lxt2_wr_vcd_truncate_bitvec(value);
lt->dict = dslxt_splay (vpnt, lt->dict); lt->dict = lxt2_wr_dslxt_splay (vpnt, lt->dict);
if(!dslxt_success) if(!lxt2_wr_dslxt_success)
{ {
unsigned int vlen = strlen(vpnt)+1; unsigned int vlen = strlen(vpnt)+1;
char *vcopy = (char *)malloc(vlen); char *vcopy = (char *)malloc(vlen);
strcpy(vcopy, vpnt); strcpy(vcopy, vpnt);
lt->dict_string_mem_required += vlen; lt->dict_string_mem_required += vlen;
lt->dict = dslxt_insert(vcopy, lt->dict, lt->num_dict_entries); lt->dict = lxt2_wr_dslxt_insert(vcopy, lt->dict, lt->num_dict_entries);
if(lt->dict_curr) if(lt->dict_curr)
{ {
@ -1943,12 +2019,3 @@ if(lt)
sprintf(lt->zmode, "wb%d", depth); sprintf(lt->zmode, "wb%d", depth);
} }
} }
/*
* source level compatibility stub functions
*/
void lxt2_wr_set_no_interlace(struct lxt2_wr_trace *lt) { }
void lxt2_wr_set_chg_compress(struct lxt2_wr_trace *lt) { }
void lxt2_wr_set_clock_compress(struct lxt2_wr_trace *lt) { }
void lxt2_wr_set_dict_compress(struct lxt2_wr_trace *lt, unsigned int minwidth) { }

51
vpi/lxt2_write.h
View File

@ -29,6 +29,7 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h>
#include <zlib.h> #include <zlib.h>
#define LXT2_WR_HDRID (0x1380) #define LXT2_WR_HDRID (0x1380)
@ -45,7 +46,7 @@
#define LXT2_WR_GZWRITE_BUFFER 4096 #define LXT2_WR_GZWRITE_BUFFER 4096
#define LXT2_WR_SYMPRIME 65519 #define LXT2_WR_SYMPRIME 65519
typedef unsigned long long lxttime_t; typedef uint64_t lxttime_t;
#ifndef _MSC_VER #ifndef _MSC_VER
@ -99,24 +100,24 @@ enum LXT2_WR_Encodings {
/* /*
* integer splay * integer splay
*/ */
typedef struct ds_tree_node ds_Tree; typedef struct lxt2_wr_ds_tree_node lxt2_wr_ds_Tree;
struct ds_tree_node { struct lxt2_wr_ds_tree_node {
ds_Tree * left, * right; lxt2_wr_ds_Tree * left, * right;
granmsk_t item; granmsk_t item;
int val; int val;
ds_Tree * next; lxt2_wr_ds_Tree * next;
}; };
/* /*
* string splay * string splay
*/ */
typedef struct dslxt_tree_node dslxt_Tree; typedef struct lxt2_wr_dslxt_tree_node lxt2_wr_dslxt_Tree;
struct dslxt_tree_node { struct lxt2_wr_dslxt_tree_node {
dslxt_Tree * left, * right; lxt2_wr_dslxt_Tree * left, * right;
char *item; char *item;
unsigned int val; unsigned int val;
dslxt_Tree * next; lxt2_wr_dslxt_Tree * next;
}; };
@ -125,16 +126,16 @@ struct lxt2_wr_trace
FILE *handle; FILE *handle;
gzFile zhandle; gzFile zhandle;
dslxt_Tree *dict; /* dictionary manipulation */ lxt2_wr_dslxt_Tree *dict; /* dictionary manipulation */
unsigned int num_dict_entries; unsigned int num_dict_entries;
unsigned int dict_string_mem_required; unsigned int dict_string_mem_required;
dslxt_Tree *dict_head; lxt2_wr_dslxt_Tree *dict_head;
dslxt_Tree *dict_curr; lxt2_wr_dslxt_Tree *dict_curr;
ds_Tree *mapdict; /* bitmap compression */ lxt2_wr_ds_Tree *mapdict; /* bitmap compression */
unsigned int num_map_entries; unsigned int num_map_entries;
ds_Tree *mapdict_head; lxt2_wr_ds_Tree *mapdict_head;
ds_Tree *mapdict_curr; lxt2_wr_ds_Tree *mapdict_curr;
unsigned int position; unsigned int position;
unsigned int zfacname_predec_size, zfacname_size, zfacgeometry_size; unsigned int zfacname_predec_size, zfacname_size, zfacgeometry_size;
@ -148,7 +149,7 @@ int numfacs, numalias;
int numfacbytes; int numfacbytes;
int longestname; int longestname;
int numsections; int numsections, numblock;
unsigned int facname_offset, facgeometry_offset; unsigned int facname_offset, facgeometry_offset;
lxttime_t mintime, maxtime; lxttime_t mintime, maxtime;
@ -175,6 +176,8 @@ unsigned granule_dirty : 1; /* for flushing out final block */
unsigned blackout : 1; /* blackout on/off */ unsigned blackout : 1; /* blackout on/off */
unsigned partial : 1; /* partial (vertical) trace support */ unsigned partial : 1; /* partial (vertical) trace support */
unsigned partial_zip : 1; /* partial (vertical) trace support for zip subregions */ unsigned partial_zip : 1; /* partial (vertical) trace support for zip subregions */
unsigned no_checkpoint : 1; /* turns off interblock checkpointing */
unsigned partial_preference : 1; /* partial preference encountered on some facs */
char initial_value; char initial_value;
@ -201,8 +204,10 @@ int msb, lsb;
int len; int len;
int flags; int flags;
unsigned partial_preference : 1; /* in order to shove nets to the first partial group */
unsigned int chgpos; unsigned int chgpos;
granmsk_t msk; /* must contain LXT2_WR_GRANULE_SIZE bits! */ granmsk_t msk; /* must contain LXT2_WR_GRANULE_SIZE bits! */
unsigned int chg[LXT2_WR_GRANULE_SIZE]; unsigned int chg[LXT2_WR_GRANULE_SIZE];
}; };
@ -237,13 +242,17 @@ struct lxt2_wr_trace * lxt2_wr_init(const char *name);
void lxt2_wr_flush(struct lxt2_wr_trace *lt); void lxt2_wr_flush(struct lxt2_wr_trace *lt);
void lxt2_wr_close(struct lxt2_wr_trace *lt); void lxt2_wr_close(struct lxt2_wr_trace *lt);
/* 0 = no compression, 9 = best compression, 4 = default */ /* 0 = no compression, 9 = best compression, 4 = default */
void lxt2_wr_set_compression_depth(struct lxt2_wr_trace *lt, unsigned int depth); void lxt2_wr_set_compression_depth(struct lxt2_wr_trace *lt, unsigned int depth);
/* default is partial off, turning on makes for faster trace reads, nonzero zipmode causes vertical compression */ /* default is partial off, turning on makes for faster trace reads, nonzero zipmode causes vertical compression */
void lxt2_wr_set_partial_off(struct lxt2_wr_trace *lt); void lxt2_wr_set_partial_off(struct lxt2_wr_trace *lt);
void lxt2_wr_set_partial_on(struct lxt2_wr_trace *lt, int zipmode); void lxt2_wr_set_partial_on(struct lxt2_wr_trace *lt, int zipmode);
void lxt2_wr_set_partial_preference(struct lxt2_wr_trace *lt, const char *name);
/* turning off checkpointing makes for smaller files */
void lxt2_wr_set_checkpoint_off(struct lxt2_wr_trace *lt);
void lxt2_wr_set_checkpoint_on(struct lxt2_wr_trace *lt);
/* facility creation */ /* facility creation */
void lxt2_wr_set_initial_value(struct lxt2_wr_trace *lt, char value); void lxt2_wr_set_initial_value(struct lxt2_wr_trace *lt, char value);
@ -272,10 +281,4 @@ int lxt2_wr_emit_value_double(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol
int lxt2_wr_emit_value_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value); int lxt2_wr_emit_value_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value);
int lxt2_wr_emit_value_bit_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value); int lxt2_wr_emit_value_bit_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value);
/* old lxt dummy functions (might be used later) */
void lxt2_wr_set_no_interlace(struct lxt2_wr_trace *lt);
void lxt2_wr_set_chg_compress(struct lxt2_wr_trace *lt);
void lxt2_wr_set_clock_compress(struct lxt2_wr_trace *lt);
void lxt2_wr_set_dict_compress(struct lxt2_wr_trace *lt, unsigned int minwidth);
#endif #endif