Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'antmicro-memspeed-ra'

This commit is contained in:
Florent Kermarrec 2021-08-23 17:03:20 +02:00
parent 16f6f08d00 b50d5aa328
commit 7fa49e2d0d
4 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
litex/soc/software/bios/cmds/cmd_mem.c
View File

@ -202,9 +202,10 @@ static void mem_speed_handler(int nb_params, char **params)
unsigned int *addr;
unsigned long size;
bool read_only = false;
bool random_access = false;
if (nb_params < 1) {
printf("mem_speed <addr> <size> [<readonly>]");
printf("mem_speed <addr> <size> [<readonly>] [<random_access>]");
return;
}
@ -228,6 +229,14 @@ static void mem_speed_handler(int nb_params, char **params)
}
}
memspeed(addr, size, read_only);
if (nb_params >= 4) {
random_access = (bool) strtoul(params[3], &c, 0);
if (*c != 0) {
printf("Incorrect random_access value");
return;
}
}
memspeed(addr, size, read_only, random_access);
}
define_command(mem_speed, mem_speed_handler, "Test memory speed", MEM_CMDS);

2
litex/soc/software/include/base/memtest.h
View File

@ -20,7 +20,7 @@ int memtest_bus(unsigned int *addr, unsigned long size);
int memtest_addr(unsigned int *addr, unsigned long size, int random);
int memtest_data(unsigned int *addr, unsigned long size, int random, struct memtest_config *config);
void memspeed(unsigned int *addr, unsigned long size, bool read_only);
void memspeed(unsigned int *addr, unsigned long size, bool read_only, bool random_access);
int memtest(unsigned int *addr, unsigned long maxsize);
#endif /* __MEMTEST_H */

18
litex/soc/software/libbase/memtest.c
View File

@ -252,10 +252,11 @@ int memtest_data(unsigned int *addr, unsigned long size, int random, struct memt
return errors;
}
void memspeed(unsigned int *addr, unsigned long size, bool read_only)
void memspeed(unsigned int *addr, unsigned long size, bool read_only, bool random_access)
{
volatile unsigned long *array = (unsigned long *)addr;
int i;
unsigned int seed_32;
uint32_t start, end;
unsigned long write_speed = 0;
unsigned long read_speed;
@ -297,9 +298,20 @@ void memspeed(unsigned int *addr, unsigned long size, bool read_only)
timer0_en_write(1);
timer0_update_value_write(1);
start = timer0_value_read();
for(i = 0; i < size/sz; i++) {
data = array[i];
int num = size/sz;
if (random_access) {
for (i = 0; i < size/sz; i++) {
seed_32 = seed_to_data_32(seed_32, i);
data = array[seed_32 % num];
}
} else {
for (i = 0; i < size/sz; i++) {
data = array[i];
}
}
timer0_update_value_write(1);
end = timer0_value_read();
uint64_t numerator = ((uint64_t)size)*((uint64_t)CONFIG_CLOCK_FREQUENCY);

11
litex/soc/software/liblitespi/spiflash.c
View File

@ -86,7 +86,6 @@ void spiflash_init(void)
{
printf("Initializing %s SPI Flash...\n", SPIFLASH_MODULE_NAME);
/* Dummy bits setup. */
#ifdef SPIFLASH_MODULE_DUMMY_BITS
spiflash_dummy_bits_setup(SPIFLASH_MODULE_DUMMY_BITS);
#endif
@ -109,7 +108,17 @@ void spiflash_init(void)
#endif
/* Clk frequency auto-calibration. */
#ifndef SPIFLASH_SKIP_FREQ_INIT
/* Clk frequency auto-calibration. */
spiflash_freq_init();
printf("Warning: SPI Flash frequency auto-calibration skipped, using the default divisor of %d", spiflash_phy_clk_divisor_read());
#endif
printf("SPI Flash bandwidth benchmarks\n");
printf("Sequential accesses:");
memspeed(SPIFLASH_BASE, SPIFLASH_SIZE, 1, 0);
printf("Random accesses:");
memspeed(SPIFLASH_BASE, SPIFLASH_SIZE, 1, 1);
}
#endif