Merge pull request #1936 from verilog-to-routing/S10_vqm2blif_fixes

Update the vqm2blif parser to add support for Stratix 10 and Agliex vqm files

Author: vaughnbetz

libs/libvqm/vqm_parser.l

@@ -38,7 +38,9 @@
 
 %%
 ^[ \t]*\/\/[^\n\r]*(\n|\r\n)                /* skip one-line comments */
+^[ \t]*\(\*[^\n\r]*\*\)                     /* skip synthesis attributes and directives */
 [ \t]+                                      /* skip white spaces */
+!					    /* skip the logical operator ! applied on the input ports of the lut - this results in lut mask not being valid anoymore */
 (\n|\r\n)                                   /* skip empty lines */
 module                                      return TOKEN_MODULE;
 endmodule                                   return TOKEN_ENDMODULE;
@@ -60,7 +62,7 @@ assign                                      return TOKEN_ASSIGN;
                                                 yylval.value = atoi(yytext); 
                                                 return TOKEN_INTCONSTANT;
                                             }
-\\[^ ^\t]+                                  {
+\\[^ ^\t^;]+                                {
                                                 yylval.string = (char *)malloc(yyleng);
                                                 strcpy(yylval.string, yytext+1);
                                                 return TOKEN_ESCAPEDID;
@@ -71,7 +73,7 @@ assign                                      return TOKEN_ASSIGN;
                                                 yylval.string[yyleng-2] = 0;
                                                 return TOKEN_STRING;
                                             }
-[1-9][0-9]*'b[0-9]+                         {
+[1-9][0-9]*'[b|h][0-9|A-F]+                 { /* bit strings can be in binary or hexadecimal format */ 
                                                 yylval.string = (char *)malloc(yyleng+1);
                                                 strcpy(yylval.string, yytext);
                                                 return TOKEN_BITSTRING;

libs/libvqm/vqm_parser.y

@@ -84,7 +84,7 @@ modules:	/* Empty */ {}
 			|	modules module {}
 			;
 
-module:		header declarations statements footer
+module:		header body footer
 			{
                 if(parse_info->pass_type == COUNT_PASS) {
                     parse_info->number_of_modules++;
@@ -126,11 +126,17 @@ header:		TOKEN_MODULE TOKEN_REGULARID '(' IdentifierList ')' ';'
 			}
 			;
 
+body:           /* Empty */ {}
+			|	body declaration_statement {} /* the body consists of a mix of declarations and statements */
+			;
+
 
-declarations:	/* Empty */ {}
-			|	declarations declaration {}
+declaration_statement:	        declaration
+			|
+                                statement  
 			;
 
+
 declaration:	PinType IdentifierList ';'
 				{
                     if(parse_info->pass_type == COUNT_PASS) {
@@ -158,9 +164,7 @@ declaration:	PinType IdentifierList ';'
 footer:		TOKEN_ENDMODULE	{}
 			;
 
-statements:	/* Empty */ {}
-			| statements statement {}
-			;
+
 
 statement:		AssignStatement {}
 			|	TriStatement {}
@@ -673,7 +677,16 @@ IdentifierList:		Identifier
 					}
 				;
 
-Identifier:		TOKEN_ESCAPEDID
+Identifier:	TOKEN_ESCAPEDID '[' TOKEN_INTCONSTANT ']'
+				{
+                    if(parse_info->pass_type == COUNT_PASS) {
+                        //pass
+                    } else {
+                        /* Allocate space for an identifier. Specify index used */
+                        $$ = (uintptr_t) allocate_identifier($1, T_TRUE, $3);
+                    }
+				}
+			|	TOKEN_ESCAPEDID
 				{
                     if(parse_info->pass_type == COUNT_PASS) {
                         //pass

utils/vqm2blif/src/base/vqm2blif_util.h

@@ -197,7 +197,9 @@ extern t_boolean buffd_outs;	//user-set flag that regulates whether to keep buff
 */
 const map<std::string, DeviceInfo> device_parameter_database {
     // stratix 4 device
-    {"stratixiv", {"stratixiv_lcell_comb", "combout", 1, "dffeas", "q" }}
+    {"stratixiv", {"stratixiv_lcell_comb", "combout", 1, "dffeas", "q" }},
+    {"stratix10", {"fourteennm_lcell_comb", "combout", 1, "fourteennm_ff", "q" }},
+    {"agilex", {"tennm_lcell_comb", "combout", 1, "tennm_ff", "q" }}
 };
 
 #endif