From a3bf61030d7d2eb4a50f0641f0944ce25ca16ce8 Mon Sep 17 00:00:00 2001 From: mole99 Date: Wed, 19 Apr 2023 18:35:32 +0200 Subject: [PATCH] Move SDF_INFO to start of line --- ivtest/gold/sdf_header-iverilog-stderr.gold | 0 ivtest/gold/sdf_header-iverilog-stdout.gold | 0 ivtest/gold/sdf_header-vvp-stderr.gold | 0 ivtest/gold/sdf_header-vvp-stdout.gold | 22 +++++++------- vpi/sdf_parse.y | 32 ++++++++++----------- 5 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 ivtest/gold/sdf_header-iverilog-stderr.gold delete mode 100644 ivtest/gold/sdf_header-iverilog-stdout.gold delete mode 100644 ivtest/gold/sdf_header-vvp-stderr.gold diff --git a/ivtest/gold/sdf_header-iverilog-stderr.gold b/ivtest/gold/sdf_header-iverilog-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/sdf_header-iverilog-stdout.gold b/ivtest/gold/sdf_header-iverilog-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/sdf_header-vvp-stderr.gold b/ivtest/gold/sdf_header-vvp-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/sdf_header-vvp-stdout.gold b/ivtest/gold/sdf_header-vvp-stdout.gold index 0b6de0b8e..fc0185ed4 100644 --- a/ivtest/gold/sdf_header-vvp-stdout.gold +++ b/ivtest/gold/sdf_header-vvp-stdout.gold @@ -1,11 +1,11 @@ -ivltests/sdf_header.sdf:2:SDF INFO: Version: 3.0 -ivltests/sdf_header.sdf:3:SDF INFO: Design: test -ivltests/sdf_header.sdf:4:SDF INFO: Date: Wed Mar 8 12:34:56 2023 -ivltests/sdf_header.sdf:5:SDF INFO: Vendor: No Vendor -ivltests/sdf_header.sdf:6:SDF INFO: Program: Human -ivltests/sdf_header.sdf:7:SDF INFO: Program Version: 1.0.0 -ivltests/sdf_header.sdf:8:SDF INFO: Divider: "/" -ivltests/sdf_header.sdf:9:SDF INFO: Voltage: 5.000000 -ivltests/sdf_header.sdf:10:SDF INFO: Process: best=0.65:nom=1.0:worst=1.8 -ivltests/sdf_header.sdf:11:SDF INFO: Temperature: 25.000000 -ivltests/sdf_header.sdf:12:SDF INFO: Timescale: 1ps +SDF INFO: ivltests/sdf_header.sdf:2: Version: 3.0 +SDF INFO: ivltests/sdf_header.sdf:3: Design: test +SDF INFO: ivltests/sdf_header.sdf:4: Date: Wed Mar 8 12:34:56 2023 +SDF INFO: ivltests/sdf_header.sdf:5: Vendor: No Vendor +SDF INFO: ivltests/sdf_header.sdf:6: Program: Human +SDF INFO: ivltests/sdf_header.sdf:7: Program Version: 1.0.0 +SDF INFO: ivltests/sdf_header.sdf:8: Divider: "/" +SDF INFO: ivltests/sdf_header.sdf:9: Voltage: 5.000000 +SDF INFO: ivltests/sdf_header.sdf:10: Process: best=0.65:nom=1.0:worst=1.8 +SDF INFO: ivltests/sdf_header.sdf:11: Temperature: 25.000000 +SDF INFO: ivltests/sdf_header.sdf:12: Timescale: 1ps diff --git a/vpi/sdf_parse.y b/vpi/sdf_parse.y index 50d4935d2..58c600880 100644 --- a/vpi/sdf_parse.y +++ b/vpi/sdf_parse.y @@ -108,7 +108,7 @@ sdf_header_item sdfversion : '(' K_SDFVERSION QSTRING ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Version: %s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Version: %s\n", sdf_parse_path, @2.first_line, $3); free($3); } @@ -116,7 +116,7 @@ sdfversion design_name : '(' K_DESIGN QSTRING ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Design: %s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Design: %s\n", sdf_parse_path, @2.first_line, $3); free($3); } @@ -124,7 +124,7 @@ design_name date : '(' K_DATE QSTRING ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Date: %s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Date: %s\n", sdf_parse_path, @2.first_line, $3); free($3); } @@ -132,7 +132,7 @@ date vendor : '(' K_VENDOR QSTRING ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Vendor: %s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Vendor: %s\n", sdf_parse_path, @2.first_line, $3); free($3); } @@ -140,7 +140,7 @@ vendor program_name : '(' K_PROGRAM QSTRING ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Program: %s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Program: %s\n", sdf_parse_path, @2.first_line, $3); free($3); } @@ -148,7 +148,7 @@ program_name program_version : '(' K_VERSION QSTRING ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Program Version: %s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Program Version: %s\n", sdf_parse_path, @2.first_line, $3); free($3); } @@ -157,15 +157,15 @@ program_version hierarchy_divider : '(' K_DIVIDER '.' ')' { sdf_use_hchar = '.'; - if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Divider: \"%c\"\n", sdf_parse_path, @1.first_line, sdf_use_hchar); + if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Divider: \"%c\"\n", sdf_parse_path, @1.first_line, sdf_use_hchar); } | '(' K_DIVIDER '/' ')' { sdf_use_hchar = '/'; - if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Divider: \"%c\"\n", sdf_parse_path, @1.first_line, sdf_use_hchar); + if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Divider: \"%c\"\n", sdf_parse_path, @1.first_line, sdf_use_hchar); } | '(' K_DIVIDER HCHAR ')' { /* sdf_use_hchar no-change */ - if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Divider: \"%c\"\n", sdf_parse_path, @1.first_line, sdf_use_hchar); + if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Divider: \"%c\"\n", sdf_parse_path, @1.first_line, sdf_use_hchar); } ; @@ -175,18 +175,18 @@ voltage if (! $3.defined) { vpi_printf("%s:%d: SDF ERROR: Chosen value not defined.\n", sdf_parse_path, @1.first_line); } - else if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Voltage: %f\n", + else if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Voltage: %f\n", sdf_parse_path, @2.first_line, $3.value); } | '(' K_VOLTAGE signed_real_number ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Voltage: %f\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Voltage: %f\n", sdf_parse_path, @2.first_line, $3); } ; process : '(' K_PROCESS QSTRING ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Process: %s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Process: %s\n", sdf_parse_path, @2.first_line, $3); free($3); } @@ -198,23 +198,23 @@ temperature if (! $3.defined) { vpi_printf("%s:%d: SDF ERROR: Chosen value not defined.\n", sdf_parse_path, @1.first_line); } - else if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Temperature: %f\n", + else if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Temperature: %f\n", sdf_parse_path, @2.first_line, $3.value); } | '(' K_TEMPERATURE signed_real_number ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Temperature: %f\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Temperature: %f\n", sdf_parse_path, @2.first_line, $3); } ; time_scale : '(' K_TIMESCALE REAL_NUMBER IDENTIFIER ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Timescale: %f%s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Timescale: %f%s\n", sdf_parse_path, @2.first_line, $3, $4); free($4); } | '(' K_TIMESCALE INTEGER IDENTIFIER ')' - { if (sdf_flag_inform) vpi_printf("%s:%d:SDF INFO: Timescale: %lu%s\n", + { if (sdf_flag_inform) vpi_printf("SDF INFO: %s:%d: Timescale: %lu%s\n", sdf_parse_path, @2.first_line, $3, $4); free($4); }