Skip to content

Commit

Permalink
Merge pull request #645 from intel/push-2024-01-03
Browse files Browse the repository at this point in the history
Push 2024 01 03
rdementi authored Jan 4, 2024
2 parents b589a20 + d02c37e commit a0ff861
Showing 12 changed files with 33 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cov-linux-report.yml
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ jobs:
ci-cov-linux-report.sh PCM.linux.and.python
- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: coverity-linux-and-python-report-${{ github.sha }}
path: "*-Report.pdf"
2 changes: 1 addition & 1 deletion .github/workflows/ci-cov-linux.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
submodules: recursive
- name: coverity-linux
2 changes: 1 addition & 1 deletion .github/workflows/ci-cov-python.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
submodules: recursive
- name: coverity-python
4 changes: 2 additions & 2 deletions .github/workflows/ci-cpack.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
submodules: recursive
- name: Configure CMake
@@ -48,7 +48,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
submodules: recursive
- name: Configure CMake
4 changes: 2 additions & 2 deletions .github/workflows/ci-gcc48.yml
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- name: install simdjson
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
repository: simdjson/simdjson
path: src/simdjson
6 changes: 3 additions & 3 deletions .github/workflows/ci-gcc5.yml
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- name: install simdjson
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
repository: simdjson/simdjson
path: src/simdjson
@@ -43,7 +43,7 @@ jobs:
cd ${{ github.workspace }}/build
make install -j$(nproc)
- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: PCMforLinuxGCC5
path: build/bin/*
4 changes: 2 additions & 2 deletions .github/workflows/ci-gcc7.yml
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- name: install simdjson
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
repository: simdjson/simdjson
path: src/simdjson
20 changes: 10 additions & 10 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
submodules: recursive
- name: Configure CMake
@@ -40,55 +40,55 @@ jobs:
sh ${{ github.workspace }}/tests/test.sh 2>&1 | tee test-log.txt
- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: test-log-${{ github.sha }}
path: test-log.txt

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: test-log-raw-tr-wo_ext-${{ github.sha }}
path: build/bin/raw_tr_wo_ext.csv

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: test-log-raw-tr-wi_ext-${{ github.sha }}
path: build/bin/raw_tr_wi_ext.csv

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: pcm-csv-${{ github.sha }}
path: build/bin/pcm.csv

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: pcm-memory-csv-${{ github.sha }}
path: build/bin/pcm-memory.csv

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: test-log-raw-tr-wi_ext-single_header-${{ github.sha }}
path: build/bin/raw_tr_wi_ext_single_header.csv

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: test-log-raw-edp-${{ github.sha }}
path: build/bin/raw_edp.txt

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: test-log-raw-json-${{ github.sha }}
path: build/bin/raw_json.json

- name: upload-artifact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
with:
name: test-log-raw-edp-offlined-cores-${{ github.sha }}
path: build/bin/raw_edp_offlined_cores.txt
6 changes: 5 additions & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,11 @@
#
# Source repository: https://github.com/actions/dependency-review-action
name: 'Dependency Review'
on: [pull_request]
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

permissions:
contents: read
4 changes: 4 additions & 0 deletions src/mmio.cpp
Original file line number Diff line number Diff line change
@@ -226,6 +226,10 @@ MMIORange::MMIORange(uint64 baseAddr_, uint64 size_, bool readonly_) :
if (mmapAddr == MAP_FAILED)
{
std::cerr << "mmap failed: errno is " << errno << " (" << strerror(errno) << ")\n";
if (1 == errno)
{
std::cerr << "Try to add 'iomem=relaxed' parameter to the kernel boot command line and reboot.\n";
}
throw std::exception();
}
}
2 changes: 1 addition & 1 deletion src/pcm-accel-common.cpp
Original file line number Diff line number Diff line change
@@ -305,7 +305,7 @@ void readAccelCounters(SystemCounterState& sycs_)
pcm->setNumberofAccelCounters(dev_count*counter_nb);
uint32_t ctr_index = 0;
// accel_content accel_results(ACCEL_MAX, dev_content(ACCEL_IP_DEV_COUNT_MAX, ctr_data()));
sycs_.accel_counters.resize(dev_count*counter_nb);
sycs_.accel_counters.resize(size_t(dev_count) * size_t(counter_nb));
SimpleCounterState *currState = new SimpleCounterState[dev_count*counter_nb];
// programAccelCounters(m, accel, ctrs);

2 changes: 1 addition & 1 deletion src/pcm-iio.cpp
Original file line number Diff line number Diff line change
@@ -1227,7 +1227,7 @@ bool EagleStreamPlatformMapping::pciTreeDiscover(std::vector<struct iio_stacks_o

void IPlatformMapping::probeDeviceRange(std::vector<struct pci> &pci_devs, int domain, int secondary, int subordinate)
{
for (uint8_t bus = secondary; bus <= subordinate; bus++) {
for (uint8_t bus = secondary; int(bus) <= subordinate; bus++) {
for (uint8_t device = 0; device < 32; device++) {
for (uint8_t function = 0; function < 8; function++) {
struct pci child_dev;

0 comments on commit a0ff861

Please sign in to comment.