riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'tileable_routing' into dev

This commit is contained in:
tangxifan 2019-07-16 14:38:18 -06:00
parent 115411941b be255edc68
commit b807fdb38a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ace2/CMakeLists.txt
View File

@ -37,6 +37,7 @@ set_target_properties(libace PROPERTIES PREFIX "") #Avoid extra 'lib' prefix#Cre
# Specify dependency # Specify dependency
target_link_libraries(libace target_link_libraries(libace
libabc libabc
libvtrutil
${CMAKE_DL_LIBS}) ${CMAKE_DL_LIBS})
add_executable(ace ${EXEC_SOURCES}) add_executable(ace ${EXEC_SOURCES})

16
ace2/SRC/io_ace.c
View File

@ -1,5 +1,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "vtr_assert.h"
#include "ace.h" #include "ace.h"
#include "io_ace.h" #include "io_ace.h"
@ -34,7 +36,7 @@ void ace_io_print_activity(Abc_Ntk_t * ntk, FILE * fp) {
Abc_NtkForEachObj(ntk, obj, i) Abc_NtkForEachObj(ntk, obj, i)
{ {
assert(obj->pCopy); VTR_ASSERT(obj->pCopy);
obj_new = obj->pCopy; obj_new = obj->pCopy;
Ace_Obj_Info_t * info = Ace_ObjInfo(obj); Ace_Obj_Info_t * info = Ace_ObjInfo(obj);
@ -269,7 +271,7 @@ int ace_io_read_activity(Abc_Ntk_t * ntk, FILE * in_file_desc,
// Read real PIs activity values from file // Read real PIs activity values from file
res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc); res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc);
assert(res); VTR_ASSERT(res);
while (!feof(in_file_desc)) { while (!feof(in_file_desc)) {
sscanf(line, "%s %lf %lf\n", pi_name, &static_prob, sscanf(line, "%s %lf %lf\n", pi_name, &static_prob,
&switch_prob); &switch_prob);
@ -292,7 +294,7 @@ int ace_io_read_activity(Abc_Ntk_t * ntk, FILE * in_file_desc,
info->switch_act = switch_prob; info->switch_act = switch_prob;
res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc); res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc);
assert(res); VTR_ASSERT(res);
} }
} else if (pi_format == ACE_VEC) { } else if (pi_format == ACE_VEC) {
printf("Reading vector file...\n"); printf("Reading vector file...\n");
@ -305,10 +307,10 @@ int ace_io_read_activity(Abc_Ntk_t * ntk, FILE * in_file_desc,
char* res; char* res;
res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc); res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc);
assert(res); VTR_ASSERT(res);
while (!feof(in_file_desc)) { while (!feof(in_file_desc)) {
res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc); res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc);
assert(res); VTR_ASSERT(res);
num_vec++; num_vec++;
} }
Abc_NtkForEachPi(ntk, obj_ptr, i) Abc_NtkForEachPi(ntk, obj_ptr, i)
@ -325,7 +327,7 @@ int ace_io_read_activity(Abc_Ntk_t * ntk, FILE * in_file_desc,
num_vec = 0; num_vec = 0;
res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc); res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc);
assert(res); VTR_ASSERT(res);
while (!feof(in_file_desc)) { while (!feof(in_file_desc)) {
sscanf(line, "%s\n", vector); sscanf(line, "%s\n", vector);
@ -364,7 +366,7 @@ int ace_io_read_activity(Abc_Ntk_t * ntk, FILE * in_file_desc,
} }
res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc); res = fgets(line, ACE_CHAR_BUFFER_SIZE, in_file_desc);
assert(res); VTR_ASSERT(res);
num_vec++; num_vec++;
} }