lkg build with pipeline + FPU fixes

driver/opae/vortex.cpp

@@ -173,7 +173,7 @@ extern int vx_dev_open(vx_device_h* hdevice) {
     {   
         // Load device CAPS
         int ret = 0;
-        ret |= vx_csr_get(device, 0, CSR_IMPL_ID, &device->implementation_id);
+        ret |= vx_csr_get(device, 0, CSR_MIMPID, &device->implementation_id);
         ret |= vx_csr_get(device, 0, CSR_NC, &device->num_cores);
         ret |= vx_csr_get(device, 0, CSR_NW, &device->num_warps);
         ret |= vx_csr_get(device, 0, CSR_NT, &device->num_threads);
@@ -217,14 +217,14 @@ extern int vx_dev_close(vx_device_h hdevice) {
         unsigned value;
 
         int ret = 0;
-        ret |= vx_csr_get(hdevice, 0, CSR_INSTR_H, &value);
+        ret |= vx_csr_get(hdevice, 0, CSR_INSTRET_H, &value);
         instrs = value;
-        ret |= vx_csr_get(hdevice, 0, CSR_INSTR_L, &value);
+        ret |= vx_csr_get(hdevice, 0, CSR_INSTRET, &value);
         instrs = (instrs << 32) | value;
       
         ret |= vx_csr_get(hdevice, 0, CSR_CYCLE_H, &value);
         cycles = value;
-        ret |= vx_csr_get(hdevice, 0, CSR_CYCLE_L, &value);
+        ret |= vx_csr_get(hdevice, 0, CSR_CYCLE, &value);
         cycles = (cycles << 32) | value;
 
         float IPC = (float)(double(instrs) / double(cycles));

driver/tests/demo/kernel.dump

@@ -97,7 +97,7 @@ Disassembly of section .text:
 80000134:	0005006b          	0x5006b
 80000138:	00002197          	auipc	gp,0x2
 8000013c:	d3818193          	addi	gp,gp,-712 # 80001e70 <__global_pointer$>
-80000140:	f14025f3          	csrr	a1,mhartid
+80000140:	022025f3          	csrr	a1,0x22
 80000144:	00a59593          	slli	a1,a1,0xa
 80000148:	02002673          	csrr	a2,0x20
 8000014c:	00261613          	slli	a2,a2,0x2
@@ -145,7 +145,7 @@ Disassembly of section .text:
 800001ac:	00008067          	ret
 
 800001b0 <vx_thread_gid>:
-800001b0:	f1402573          	csrr	a0,mhartid
+800001b0:	02202573          	csrr	a0,0x22
 800001b4:	00008067          	ret
 
 800001b8 <vx_core_id>: