[Linux-hls-cvs] hls/hls hls_sched_ps.c,1.10,1.11 hls_utils.c,1.16,1.17

[<lu...@us...>]

Update of /cvsroot/linux-hls/hls/hls
In directory sc8-pr-cvs1:/tmp/cvs-serv5866/hls

Modified Files:
	hls_sched_ps.c hls_utils.c 
Log Message:
- Some simulator work
- Unbreak the PS scheduler (share was 0 by default)
- Add a filter to convert the simulator output in a .fig file


Index: hls_sched_ps.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/hls/hls_sched_ps.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** hls_sched_ps.c	8 Nov 2003 10:34:31 -0000	1.10
--- hls_sched_ps.c	5 Dec 2003 21:48:39 -0000	1.11
***************
*** 209,213 ****
      ud->Warp = 0;
      ud->AVT = 0;
!     ud->Share = 0;
      ud->StartTime = -1;
      /*
--- 209,214 ----
      ud->Warp = 0;
      ud->AVT = 0;
!     /* ud->Share = 10; */
!     ud->Share = Inst->DefaultPri * 10;
      ud->StartTime = -1;
      /*
***************
*** 438,442 ****
  
    HLS_ASSERT (Inst);
!   
    if (Inst->TVP.State != VP_Ready) {
      Next = GetVPSmallestEVT (Inst);
--- 439,443 ----
  
    HLS_ASSERT (Inst);
!  
    if (Inst->TVP.State != VP_Ready) {
      Next = GetVPSmallestEVT (Inst);
***************
*** 612,616 ****
        // HACK
        if (ud->Share == 0) {
! 	ud->Share = 10;
        }
        status = HLS_SUCCESS;
--- 613,620 ----
        // HACK
        if (ud->Share == 0) {
!         ud->Share = Inst->DefaultPri * 10;
!         if (ud->Share == 0) {
! 	  ud->Share = 10;
! 	}
        }
        status = HLS_SUCCESS;

Index: hls_utils.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/hls/hls_utils.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** hls_utils.c	29 Nov 2003 09:11:34 -0000	1.16
--- hls_utils.c	5 Dec 2003 21:48:39 -0000	1.17
***************
*** 362,367 ****
    HLSPS1 = HLSNewSchedInstance ("PS", "ps1", HLSFP1);
    HLS_ASSERT (HLSPS1);
!   SetDefPriForSched (9, HLSPS1);
!   hls_setparam_ascii(HLSPS1, "9");
    
    HLSRES = HLSNewSchedInstance ("RES", "res1", HLSFP1);
--- 362,367 ----
    HLSPS1 = HLSNewSchedInstance ("PS", "ps1", HLSFP1);
    HLS_ASSERT (HLSPS1);
!   SetDefPriForSched (11, HLSPS1);
!   hls_setparam_ascii(HLSPS1, "11");
    
    HLSRES = HLSNewSchedInstance ("RES", "res1", HLSFP1);