Merge pull request #611 from antmicro/rk/parameter-fixes

Parameter handling fixes

Author: rkapuscik

.github/workflows/main.yml

@@ -668,7 +668,7 @@ jobs:
       - name: Generate matrix (vcddiff)
         id: generate-matrix-vcddiff
         run: |
-          matrix="$(cd uhdm-integration && python list.py -d tests -s ibex swerv synthesis opentitan hello-uvm assignment-pattern Forever BitsCallOnType OneClass Continue AnonymousUnion FunctionOnDesignLevel ParameterUnpackedArray VoidFunction2Returns PatternStruct ImportedFunctionCallInModuleAndSubmodule VoidFunctionWithoutReturn cmake PutC OneThis CastInFunctionInGenBlock PatternType FunctionOutputArgument GetC ForkJoinTypes EnumFirstInInitial ImportFunction DpiChandle Disable EnumFirst TypedefOnFileLevel UnsizedConstantsParameterParsing Fork PatternInFunction TypedefVariableDimensions ParameterUnpackedLogicArray SelectFromUnpackedInFunction PatternReplication VoidFunction MultiplePrints BitSelectPartSelectInFunction ImportPackageWithFunction ParameterPackedArray StringAssignment SystemFunctions 2DFunctionArg ArrayInit array-copy FunctionColonReference ParameterColonReference ParameterSizeOfInstance PkgParamAsFunctionArg xor_assignment fsm_using_always OneNetInterf cs_registers UnpackedArray InterfaceAssign fsm_using_function OneNetRange ParameterWithUnderscoreValueDividedPassedFromCommandLine FunctionExportDPI OnePackage InterfaceInitial InterfaceAlways OneCast fsm_single_always TaskExportDPI OneImport hier_path CastStructArray InterfaceAsPort ParameterInitializedByPartSelectOfParameters ParameterInitializedByPartSelectOfParametersAssignedToVar StringAssignment EnumParameterInNestedModules 2DeclarationsInFor 1DUnpackedArray 2DUnpackedArray ArraySize AssignBitsCallToSubmoduleParameter DeclarationInFor EnumArrayListedElements EnumArray DivisionOfSize ImportedPackageEnumItemInInterface InterfaceVariable ConstSizes InterfaceParameterSetValue InterfaceWithPort InterfaceAsPortAssignValueInSubmodule InterfaceParameter LogicPackedArray NestedParamSubstitution MultiAssignmentPatternOfConcat MixedPatterns NegationOfPatternParameterInInstance OneArithShift ParameterPackedArraySurelogSubstitution PatternDefault PatternAsParameterOfInstance Repeat Shortreal TypedefedRangedFunctionArgument RealValue TaskImportDPI TaskOutputArgument TypedefAliasInPackage PartSelectOfPartSelectedBitSelect TaskReturn PatternAsFunctionArgument PatternIndexes ReturnEnumArray unary_op_minus TypedefPackedDimensions unary_op_plus UnsizedConstantParameter unary_op_not_log UnsizedConstantParameterInInstance UnsizedConstantsParsing UnsizedConstant FunctionWithOverriddenParameter ImportedDoubleCastedParameter ImportedEnumCast ParameterInitializationWithNegation StringAssignConcatenation StringLocalParamInitByConcatenation StructParameterInitializedWithPatternAndReferenced StringWithBackslash serv-minimal serv conditional_if AssignSumOfConstants AssignSumOfConstantsInSubmodule AssignSumWithParameter AssignSumWithParameterInSubmodule CastClog2 CastClog2ToMinimalSizeOfParamValue CastClog2ToMinimalSizeOfParamValueFromCommandLine CastToSumOfConstants CastToSumWithParameterInSubmodule Clog2OfSumWithParameterIn2InstancesOfSubmodule OutputSizeWithParameterOfInstanceInitializedByStructMember ParameterInGenScopeInitializedWithLongConstant)"
+          matrix="$(cd uhdm-integration && python list.py -d tests -s ibex swerv synthesis opentitan hello-uvm assignment-pattern Forever BitsCallOnType OneClass Continue AnonymousUnion FunctionOnDesignLevel ParameterUnpackedArray VoidFunction2Returns PatternStruct ImportedFunctionCallInModuleAndSubmodule VoidFunctionWithoutReturn cmake PutC OneThis CastInFunctionInGenBlock PatternType FunctionOutputArgument GetC ForkJoinTypes EnumFirstInInitial ImportFunction DpiChandle Disable EnumFirst TypedefOnFileLevel UnsizedConstantsParameterParsing Fork PatternInFunction TypedefVariableDimensions ParameterUnpackedLogicArray SelectFromUnpackedInFunction PatternReplication VoidFunction MultiplePrints BitSelectPartSelectInFunction ImportPackageWithFunction ParameterPackedArray StringAssignment SystemFunctions 2DFunctionArg ArrayInit array-copy FunctionColonReference ParameterColonReference ParameterSizeOfInstance PkgParamAsFunctionArg xor_assignment fsm_using_always OneNetInterf cs_registers UnpackedArray InterfaceAssign fsm_using_function OneNetRange ParameterWithUnderscoreValueDividedPassedFromCommandLine FunctionExportDPI OnePackage InterfaceInitial InterfaceAlways OneCast fsm_single_always TaskExportDPI OneImport hier_path CastStructArray InterfaceAsPort ParameterInitializedByPartSelectOfParameters ParameterInitializedByPartSelectOfParametersAssignedToVar StringAssignment EnumParameterInNestedModules 2DeclarationsInFor 1DUnpackedArray 2DUnpackedArray ArraySize AssignBitsCallToSubmoduleParameter DeclarationInFor EnumArrayListedElements EnumArray DivisionOfSize ImportedPackageEnumItemInInterface InterfaceVariable ConstSizes InterfaceParameterSetValue InterfaceWithPort InterfaceAsPortAssignValueInSubmodule InterfaceParameter LogicPackedArray NestedParamSubstitution MultiAssignmentPatternOfConcat MixedPatterns NegationOfPatternParameterInInstance OneArithShift ParameterPackedArraySurelogSubstitution PatternDefault PatternAsParameterOfInstance Repeat Shortreal TypedefedRangedFunctionArgument RealValue TaskImportDPI TaskOutputArgument TypedefAliasInPackage PartSelectOfPartSelectedBitSelect TaskReturn PatternAsFunctionArgument PatternIndexes ReturnEnumArray unary_op_minus TypedefPackedDimensions unary_op_plus UnsizedConstantParameter unary_op_not_log UnsizedConstantParameterInInstance UnsizedConstantsParsing UnsizedConstant FunctionWithOverriddenParameter ImportedDoubleCastedParameter ImportedEnumCast ParameterInitializationWithNegation StringAssignConcatenation StringLocalParamInitByConcatenation StructParameterInitializedWithPatternAndReferenced StringWithBackslash serv-minimal serv conditional_if AssignSumOfConstants AssignSumOfConstantsInSubmodule AssignSumWithParameter AssignSumWithParameterInSubmodule CastClog2 CastClog2ToMinimalSizeOfParamValue CastClog2ToMinimalSizeOfParamValueFromCommandLine CastToSumOfConstants CastToSumWithParameterInSubmodule Clog2OfSumWithParameterIn2InstancesOfSubmodule OutputSizeWithParameterOfInstanceInitializedByStructMember ParameterInGenScopeInitializedWithLongConstant ImportedParameter ImportTypeOfPort ImportParametrizedTypeAndDeclareParamWithTheSameName ParameterPassedToSubmoduleOfSubmodule ParameterPassedTo3TimesNestedSubmodule ParameterPassedToSubmoduleInGenscopeOfSubmodule ParameterInitializedInTopOf5LevelHierarchy ParameterInitializedInSubModuleOfTopOf5LevelHierarchy ParameterInitializedInTopOf5LevelHierarchyWithUnusedParamInTheMiddle ParameterInitializedInTopOf5LevelHierarchyWithUnusedParamOfDifferentTypeInTheMiddle)"
           echo "::set-output name=matrix::$matrix"
           echo "matrix vcddiff: $matrix"
 

src/UhdmAst.cpp

@@ -1276,17 +1276,45 @@ AstMethodCall* process_method_call(vpiHandle obj_h, AstNode* fromp, UhdmShared&
 AstNode* process_hierPath(vpiHandle obj_h, UhdmShared& shared) {
     AstNode* hierPathp = nullptr;
     AstNode* hierItemp = nullptr;
+    FileLine* fl = make_fileline(obj_h);
+    bool expr_const_present = false;
+    std::string objectName;
+    
+    if (vpiHandle expr_h = vpi_handle(vpiExpr, obj_h)) {
+        if (vpi_get(vpiType, expr_h) == vpiConstant) {
+            expr_const_present = true;
+            objectName = get_object_name(obj_h);
+            objectName = std::regex_replace(objectName, std::regex("\\."), "_");
+
+            AstNode* constp = get_value_as_node(expr_h, true);
+            vpiHandle typespec_h = vpi_handle(vpiTypespec, obj_h);
+            AstNodeDType* dtypep = getDType(fl, typespec_h, shared);
+            vpi_release_handle(typespec_h);
+
+            std::string moduleName = shared.moduleNamesStack.top();
+            AstVar* temporaryParam = new AstVar(fl, AstVarType::LPARAM, objectName, VFlagChildDType(), dtypep);
+            temporaryParam->valuep(constp);
+
+            shared.top_param_map[moduleName][objectName] = temporaryParam;
+        }
+        vpi_release_handle(expr_h);
+    }
 
     vpiHandle actual_itr = vpi_iterate(vpiActual, obj_h);
     while (vpiHandle actual_h = vpi_scan(actual_itr)) {
         if(vpi_get(vpiType, actual_h) == vpiMethodFuncCall) {
             hierPathp = process_method_call(actual_h, hierPathp, shared);
         } else {
-            hierItemp = visit_object(actual_h, shared);
+            if (expr_const_present) {
+                hierItemp = get_referenceNode(make_fileline(obj_h), objectName, shared);
+                expr_const_present = false;
+            } else {
+                hierItemp = visit_object(actual_h, shared);
+            }
             if (hierPathp == nullptr)
                 hierPathp = hierItemp;
             else
-                hierPathp = new AstDot(make_fileline(obj_h), false, hierPathp, hierItemp);
+                hierPathp = new AstDot(fl, false, hierPathp, hierItemp);
         }
         vpi_release_handle(actual_h);
     }
@@ -1622,7 +1650,15 @@ AstNode* process_typedef(vpiHandle obj_h, UhdmShared& shared) {
     std::string objectName = get_object_name(obj_h);
 
     auto pos = objectName.rfind("::");
-    if (pos != std::string::npos) objectName = objectName.substr(pos + 2);
+    if (pos != std::string::npos) {
+        std::string packageName = objectName.substr(0, pos + 2);
+        std::string baseName = objectName.substr(pos + 2);
+        if (packageName != shared.package_prefix) {
+            return get_type_reference(make_fileline(obj_h), baseName, objectName, shared);
+        } else {
+            objectName = baseName;
+        }
+    }
 
     AstNodeDType* refp = nullptr;
     if (vpiHandle alias_h = vpi_handle(vpiTypedefAlias, obj_h)) {
@@ -1893,6 +1929,7 @@ AstNode* visit_object(vpiHandle obj_h, UhdmShared& shared) {
     case vpiModule: {
         std::string modDefName = get_object_name(obj_h, {vpiDefName});
         std::string modType = modDefName;
+        shared.moduleNamesStack.push(modDefName);
         remove_scope(modType);
         AstModule* module;
 
@@ -1902,6 +1939,7 @@ AstNode* visit_object(vpiHandle obj_h, UhdmShared& shared) {
         if (it != shared.top_nodes.end()) {
             // Was created before, fill missing
             module = reinterpret_cast<AstModule*>(it->second);
+
             // If available, check vpiFullName instead of vpiName, as vpiName can equal vpiDefName
             std::string fullName = objectName;
             if (auto* s = vpi_get_str(vpiFullName, obj_h)) {
@@ -2041,6 +2079,7 @@ AstNode* visit_object(vpiHandle obj_h, UhdmShared& shared) {
             if (v3Global.opt.trace()) { module->modTrace(true); }
             shared.top_param_map[modDefName] = param_map;
         }
+        shared.moduleNamesStack.pop();
 
         // If available, check vpiFullName instead of vpiName, as vpiName can equal vpiDefName
         std::string fullName = objectName;

src/UhdmAst.h

@@ -21,6 +21,7 @@ struct UhdmShared {
     // Store parameters here (values can be updated for each instance)
     // Final values will be added in respective module/package
     std::map<std::string, NameNodeMap> top_param_map;
+    std::stack<std::string> moduleNamesStack;
     std::set<std::tuple<std::string, int, std::string>> coverage_set;
     V3ParseSym* m_symp;
     // Used to distinguish between task/function calls inside statement hierarchy