[dv] Adjust cosim include paths

Some Spike include files can clash with libelf include files. Avoid
directly adding riscv and fesvr directories to include path to prevent
this.

dv/cosim/spike_cosim.cc

@@ -3,12 +3,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "spike_cosim.h"
-#include "config.h"
-#include "decode.h"
-#include "devices.h"
-#include "log_file.h"
-#include "processor.h"
-#include "simif.h"
+#include "riscv/config.h"
+#include "riscv/decode.h"
+#include "riscv/devices.h"
+#include "riscv/log_file.h"
+#include "riscv/processor.h"
+#include "riscv/simif.h"
 
 #include <cassert>
 #include <iostream>
@@ -17,7 +17,7 @@
 SpikeCosim::SpikeCosim(uint32_t start_pc, uint32_t start_mtvec,
                        const std::string &trace_log_path, bool secure_ibex,
                        bool icache_en)
-    : pending_iside_error(false), nmi_mode(false) {
+    : nmi_mode(false), pending_iside_error(false) {
   FILE *log_file = nullptr;
   if (trace_log_path.length() != 0) {
     log = std::make_unique<log_file_t>(trace_log_path.c_str());

dv/cosim/spike_cosim.h

@@ -6,10 +6,10 @@
 #define SPIKE_COSIM_H_
 
 #include "cosim.h"
-#include "devices.h"
-#include "log_file.h"
-#include "processor.h"
-#include "simif.h"
+#include "riscv/devices.h"
+#include "riscv/log_file.h"
+#include "riscv/processor.h"
+#include "riscv/simif.h"
 
 #include <stdint.h>
 #include <deque>

dv/uvm/core_ibex/yaml/rtl_simulation.yaml

@@ -47,8 +47,9 @@
       -f ibex_dv_cosim_dpi.f
       +define+INC_IBEX_COSIM
       -LDFLAGS '-L<IBEX_COSIM_ISS_ROOT>/lib/'
-      -CFLAGS '-I<IBEX_COSIM_ISS_ROOT>/include/riscv -I<IBEX_COSIM_ISS_ROOT>/include/softfloat'
-      -CFLAGS '-I<IBEX_COSIM_ISS_ROOT>/include/fesvr -I<IBEX_ROOT>/dv/cosim'
+      -CFLAGS '-I<IBEX_COSIM_ISS_ROOT>/include'
+      -CFLAGS '-I<IBEX_COSIM_ISS_ROOT>/include/softfloat'
+      -CFLAGS '-I<IBEX_ROOT>/dv/cosim'
       -lriscv -lsoftfloat -lfdt -ldl -ldisasm -lstdc++
   sim:
     cmd: >