Changeset 287 for soft/giet_vm/giet_xml

Timestamp:

Feb 3, 2014, 4:34:44 PM (11 years ago)

Author:

cfuguet

Message:

Modification on giet_xml parser and driver:

• Introducing a new field on the mapping_info header which is used to store the number of IRQ per processor. This number must be declared on the header of all XML description files (irq_per_proc).

• The number of channels of the ICU/XICU must be equal to the number of processors per cluster multiplied by the number of IRQ per processor (this is verified by the xml_parser).

Location:

soft/giet_vm/giet_xml

Files:

• mapping_info.h (modified) (1 diff)
• xml_driver.c (modified) (2 diffs)
• xml_parser.c (modified) (5 diffs)

soft/giet_vm/giet_xml/mapping_info.h

@@ -139 +139 @@
     unsigned int vspaces;            // number of virtual spaces
     unsigned int increment;          // vseg cluster increment for replicated periphs
+    unsigned int irq_per_proc;       // number of IRQ per processor
 
     unsigned int cma_cluster;        // index of cluster containing CMA controler

soft/giet_vm/giet_xml/xml_driver.c

@@ -45 +45 @@
         "HARD",
         "SOFT",
+        "TIME",
     };
 
@@ -229 +230 @@
     fprintf(fpout, "<?xml version = \"1.0\"?>\n\n");
 
-    fprintf(fpout, "<mapping_info signature = \"0x%x\" \n", header->signature);
-    fprintf(fpout, "              name      = \"%s\"   \n", header->name);
-    fprintf(fpout, "              x_size    = \"%d\"   \n", header->x_size);
-    fprintf(fpout, "              y_size    = \"%d\"   \n", header->y_size);
-    fprintf(fpout, "              x_width   = \"%d\"   \n", header->x_width);
-    fprintf(fpout, "              y_width   = \"%d\"   \n", header->y_width);
-    fprintf(fpout, "              vspaces   = \"%d\"   \n", header->vspaces);
-    fprintf(fpout, "              increment = \"%d\" >\n\n", header->vspaces);
+    fprintf(fpout, "<mapping_info signature    = \"0x%x\" \n" , header->signature);
+    fprintf(fpout, "              name         = \"%s\"   \n" , header->name);
+    fprintf(fpout, "              x_size       = \"%d\"   \n" , header->x_size);
+    fprintf(fpout, "              y_size       = \"%d\"   \n" , header->y_size);
+    fprintf(fpout, "              x_width      = \"%d\"   \n" , header->x_width);
+    fprintf(fpout, "              y_width      = \"%d\"   \n" , header->y_width);
+    fprintf(fpout, "              vspaces      = \"%d\"   \n" , header->vspaces);
+    fprintf(fpout, "              increment    = \"%d\"   \n" , header->vspaces);
+    fprintf(fpout, "              irq_per_proc = \"%d\" >\n\n", header->irq_per_proc);
 
     ///////////////////// clusters ///////////////////////////////////////////////

soft/giet_vm/giet_xml/xml_parser.c

@@ -115 +115 @@
 unsigned int dma_channels     = 0; // max number of DMA channels (per cluster)
 
-unsigned int icu_channels     = 0; // total number of IRQ per processor
+unsigned int icu_channels     = 0; // total number of channels  in ICU/XICU
 unsigned int tty_channels     = 0; // total number of terminals in TTY 
 unsigned int hba_channels     = 0; // total number of channels  in HBA
@@ -124 +124 @@
 unsigned int use_xcu          = 0; // using XCU (not ICU)
 unsigned int use_hba          = 0; // using HBA
-
 
 ////////////////////////////////////////////////////////////////
@@ -2064 +2063 @@
             }
 
+            // the number of ICU channels must be NB_PROCS * irq_per_proc
+            if (icu_channels != (header->irq_per_proc * proc_loc_index))
+            {
+                printf("[XML ERROR] illegal ICU number of channels. "
+                       "It must be equal to NB_PROCS * IRQ_PER_PROC\n");
+                exit(1);
+            }
+
 #if XML_PARSER_DEBUG
             printf("  end cluster set\n\n");
@@ -2294 +2301 @@
     {
         printf("[XML ERROR] illegal or missing <increment> attribute in mapping\n");
+        exit(1);
+    }
+
+    ///////// get increment attribute
+    value = getIntValue(reader, "irq_per_proc", &ok);
+    if (ok) 
+    {
+#if XML_PARSER_DEBUG
+        printf("  irq_per_proc = %d\n", value);
+#endif
+        header->irq_per_proc = value;
+    }
+    else 
+    {
+        printf("[XML ERROR] illegal or missing <irq_per_proc> attribute in mapping\n");
         exit(1);
     }
@@ -2570 +2592 @@
     file_write(fdout, "\n");
 
-    def_int_write(fdout, "IRQ_PER_PROCESSOR ", icu_channels);
+    def_int_write(fdout, "IRQ_PER_PROCESSOR ", header->irq_per_proc);
 
     file_write(fdout, epil);