[website] Updates for gem5 workshop

Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
Change-Id: I19c81540e60424fb21bd0fc316ea3a916ff0c1d6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-website/+/29295
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: Jason Lowe-Power <power.jg@gmail.com>
diff --git a/_pages/events/index.md b/_pages/events/index.md
index 6350a7e..50973f3 100644
--- a/_pages/events/index.md
+++ b/_pages/events/index.md
@@ -18,19 +18,12 @@
 
 ## ISCA 2020: 3rd gem5 Users' Workshop
 
-[More information on the workshop page.](isca-2020#3rd-gem5-users-workshop-afternoon)
+[More information on the workshop page.](isca-2020)
 
 The goal of the workshop is to provide a forum to discuss what is going on in the community, how we can best leverage each other's contributions, and how we can continue to make gem5 a successful community-supported simulation framework. The workshop will be a half day in the afternoon on May 30.
 
 Details on how to submit an abstract for a presentation can be found on the [workshop page](isca-2020).
 
-## ISCA 2020: Learning gem5 Tutorial
-
-[More information on the tutorial page.](isca-2020#learning-gem5-tutorial)
-
-This tutorial builds off of [Learning gem5](/documentation/learning_gem5/introduction) and will introduce architecture researchers to the inner workings of gem5.
-The goal of the tutorial is not to introduce attendees to every feature of gem5, but to give them a framework to succeed when using gem5 in their future research.
-
 ## ICS 2018: Vector Architecture Exploration with gem5
 
 [Vector Architecture Exploration with
diff --git a/_pages/events/isca-2020.md b/_pages/events/isca-2020.md
index b73eaa0..3e12fad 100644
--- a/_pages/events/isca-2020.md
+++ b/_pages/events/isca-2020.md
@@ -6,6 +6,120 @@
 * TOC
 {:toc}
 
+**Update on the gem5 Tutorial:** The gem5 tutorial will be postponed.
+We are planning to hold an online class this summer.
+Stay tuned and subscribe to the [gem5-users](https://lists.gem5.org/postorius/lists/gem5-users.gem5.org/) and [gem5-announce](https://lists.gem5.org/postorius/lists/gem5-announce.gem5.org/) mailing list for more information.
+
+## 3rd gem5 Users' Workshop (The first virtual version!)
+
+**Wednesday, June 3rd 12:00 PM – 2:00 PM (EDT/New York), 9:00 AM (PDT/San Francisco), 18:00 (CEST/Brussels), Thu 00:00 (CST/Beijing)**
+
+**Thursday, June 4th 10:00 AM – 11:00 AM (EDT/New York), 7:00 AM (PDT/San Francisco), 16:00 (CEST/Brussels), 22:00 (CST/Beijing)**
+
+The gem5 workshop will bring together the gem5 community to discuss their current work using and improving gem5.
+The workshop will include a number of community-contributed talks, and a town hall to discuss the recent changes in gem5 and announcing the first stable version of gem5, gem5-20.
+
+The workshop will be held over two days, June 3rd and 4th, for about two hours each day.
+The first day will feature community-contributed presentations and Q&As.
+The second day will be a community townhall-style event to gather feedback from the community on the past, present and future of gem5.
+
+[Please register for the workshop via EventBrite](https://www.eventbrite.com/e/gem5-workshop-with-isca-2020-tickets-105893911540)
+
+*Note: You are not required to register for ISCA to register for this workshop.*
+
+You will receive an email via the registration with details on how to join the interactive Zoom webinar.
+Additionally by registering, it will help us track the number of people that will be joining.
+
+### Community contributions
+
+We have 10 exciting contributed presentations.
+Each presentation will be available via YouTube about a week before the workshop.
+In addition to a video, each presenter has been invited to write a short blog post.
+We will be publishing the blog posts and videos ~2/day leading up to the workshop.
+We will be providing the links to the blog posts and videos below.
+
+During the interactive sessions on Wednesday June 3rd, the presenters will be available for short Q&A's on their work.
+Like the main ISCA presentations, each presenter will have a 10 minute slot to give a quick 2 minute pitch on their work followed by a Q&A.
+The agenda for the Q&A is shown [below](#draft-agenda-for-workshop).
+
+### gem5 Town hall
+
+On Thursday June 4th, we will host a gem5 community town hall.
+This town hall will begin with an introduction and short keynote from Jason Lowe-Power on gem5-20 and the future of gem5.
+Then, we will have a set of discussion topics to solicit feedback from the broader community.
+
+*We want to hear from you!*
+Please join the town hall no matter what your experience with gem5 is.
+We would love to hear both things that are going well with your gem5 experience as well as what can be improved.
+This is an exciting opportunity to be able to *see* and interact with others in the gem5 community!
+
+### Workshop schedule **June 3rd**
+
+**The below is stated in UTC time.**
+* EDT = UTC-4 (12PM noon start).
+* PDT = UTC-7 (9AM start).
+* Central European Summer Time = UTC+2 (6PM start).
+* China Standard Time = UTC+8 (12AM midnight start).
+
+**Each presenter will be given 10 minutes max. If presenters finish their
+pitch and Q&A in under 10 minutes, the next presenter will start. Therefore,
+this schedule should be viewed as an order of presentation and only a rough
+guide for presentation start times.**
+
+| Time        | Event                        | Authors (presenter in bold)|
+|:-----------:|:-----------------------------|:---------------------------|
+|1600 -- 1610 | Introduction to the workshop | **Jason Lowe-Power**|
+|1610 -- 1620 | A Modular and Secure System Architecture for IoT | **Nils Asmussen**|
+|1620 -- 1630 | Memory controller updates for new DRAM technologies, NVM interfaces and flexible memory topologies | **Wendy Elsasser**, Nikos Nikoleris|
+|1630 -- 1640 | HeteroGarnet - A Detailed Simulator for Diverse Interconnect Systems | **Srikant Bharadqaj**, Jieming Ying, Bradford Beckmann, Tushar Krishna|
+|1640 -- 1650 | Heterogeneous systems modeling with Adaptive Traffic Profiles | Matteo Andreozzi, **Frances Conboy**, Giovanni Stea, Raffaele Zippo|
+|1650 -- 1700 | Enabling Multi-GPU Support in gem5 | **Bobbi Winema Yogatama**, Matthew Sinclair, Michael Swift|
+|1700 -- 1710 | gem5 GUI | **Shivam Desai**, Rohit Dhamankar, Ravishdeep Singh, Ahmed Farooqui, Jason Lowe-Power, Bobby R. Bruce|
+|1710 -- 1720 | Towards full-system discrete GPU simulation | Mattew Porembra, Alexandru Dutu, Gaurav Jain, Pouya Fotouhi, Michael Boyer, Bradford M. Beckmann|
+|1720 -- 1730 | gem5art: Zen and the Art of gem5 Experiments | **Ayaz Akram**, Mahyar Samani, Hoa Nguyen, Krithiga Murugavel, Trivikram Reddy, Marjan Fariborz, Pouya Fotouhi, Jason Lowe-Power|
+|1730 -- 1740 | Modeling Modern GPU Applications in gem5 | Kyle Roarty, **Matthew Sinclair** |
+|1740 -- 1750 | Implementation of a flexible cache coherency protocol for the Ruby memory system | **Tiago Muck**, Pedro Benedicte|
+|1750 -- 1800 | Workshop wrap-up | **Jason Lowe-Power** |
+
+### Workshop schedule **June 4th**
+
+**The below is stated in UTC time.**
+* EDT = UTC-4 (10AM start).
+* PDT = UTC-7 (7AM start).
+* Central European Summer Time = UTC+2 (4PM start).
+* China Standard Time = UTC+8 (10PM start).
+
+| Time        | Event                        | Discussion Leader |
+|:-----------:|:-----------------------------|:------------------|
+|1400 -- 1420 | Introduction and gem5-20     | Jason Lowe-Power  |
+|1420 -- 1450 | General gem5 discussion      | Jason Lowe-Power  |
+|1450 --      | Other discussions to be announced soon |  |
+
+### Call for presentations
+
+The gem5 community is excited to announce the 3rd gem5 Users’ workshop held in conjunction with ISCA 2020 in Valencia, Spain. The goal of the workshop is to provide a forum to discuss what is going on in the community, how we can best leverage each other's contributions, and how we can continue to make gem5 a successful community-supported simulation framework. The workshop will be a half day in the afternoon of May 30.
+
+The workshop will follow a half-day ["Learning gem5" tutorial](https://www.gem5.org/events/isca-2020).
+
+The workshop will include a keynote presentation "RE-gem5 and gem5-20: Past, Present, and Future of the gem5 Community Infrastructure."
+
+We invite the gem5 community to submit abstracts (1-2 paragraphs) for short presentations. The scope of this workshop is broadly the gem5 user and development community. Topics of interest include:
+
+* New features added to gem5
+* New models added to gem5
+* Extensions and integrations with other simulators
+* Experience using gem5
+* Validation of gem5 models
+
+We encourage accepted presentations to post a full paper to arXiv or other archival repository in order to give other users a citable source for your contribution. These sources may be cited in future gem5 release notes.
+
+Please submit your abstracts via this [Google Form](https://forms.gle/UnpFXRvpLEFKJBb46). The deadline to submit an abstract is April 10th and we will send notifications by April 14th before the ISCA early registration deadline (April 16th). Due to the close proximity to other deadlines/conferences and the early registration deadline, there will not be any extension.
+
+Form for abstract submission: <https://forms.gle/UnpFXRvpLEFKJBb46>
+
+More information can be found on the gem5 website: <https://www.gem5.org/events/isca-2020>
+Looking forward to seeing you in Valencia!
+
 ## COVID-19 Update April 8th
 
 ISCA is going to be taking place virtually due to the COVID-19 pandemic. See <https://iscaconf.org/isca2020/> for more information.
@@ -16,8 +130,6 @@
 2. For accepted abstracts, you will be able to produce a short video and a blog post for the gem5 blog. In the week leading up to the workshop, we will advertise all of the accepted works.
 3. We will hold a synchronous virtual Q&A session (or sessions) during the week of June 1st (the original time when ISCA was scheduled). During these session(s), we will ask the authors of the accepted works to attend to encourage discussion with the broader gem5 community. Specific times for these will be announced soon. We will work with the community to choose a time that is inclusive to those in different time zones.
 
-**Update on the gem5 Tutorial:** Similarly for the gem5 tutorial, we will post videos before the week of June 1st and hold session(s) for Q&A the week of June 1st.
-
 ## gem5 Workshop and Tutorial with ISCA 2020
 
 In conjunction with [ISCA 2020](https://www.iscaconf.org/isca2020/), we will be holding a [gem5 Tutorial](#learning-gem5-tutorial) and [Workshop](#3rd-gem5-users-workshop-afternoon) on May 30th in Valencia, Spain.
@@ -27,10 +139,14 @@
 [See below](#call-for-presentations) for details on how to submit an abstract for a talk.
 
 *Note: You are not required to register for ISCA to register for this workshop.*
-We hope to see you in Valencia!
+~~We hope to see you in Valencia!~~
 
 ## Learning gem5 Tutorial
 
+**Postponed due to virtulization of ISCA.**
+We are planning to hold an online class this summer.
+Stay tuned and subscribe to the [gem5-users](https://lists.gem5.org/postorius/lists/gem5-users.gem5.org/) and [gem5-announce](https://lists.gem5.org/postorius/lists/gem5-announce.gem5.org/) mailing list for more information.
+
 This tutorial builds off of [Learning gem5](/documentation/learning_gem5/introduction) and will introduce architecture researchers to the inner workings of gem5.
 The goal of the tutorial is not to introduce attendees to every feature of gem5, but to give them a framework to succeed when using gem5 in their future research.
 
@@ -72,41 +188,3 @@
   * Overview of full system simulation
   * Briefly gem5's other features
   * gem5 limitations
-
-## 3rd gem5 Users' Workshop (Afternoon)
-
-### Call for presentations
-
-The gem5 community is excited to announce the 3rd gem5 Users’ workshop held in conjunction with ISCA 2020 in Valencia, Spain. The goal of the workshop is to provide a forum to discuss what is going on in the community, how we can best leverage each other's contributions, and how we can continue to make gem5 a successful community-supported simulation framework. The workshop will be a half day in the afternoon of May 30.
-
-The workshop will follow a half-day ["Learning gem5" tutorial](https://www.gem5.org/events/isca-2020).
-
-The workshop will include a keynote presentation "RE-gem5 and gem5-20: Past, Present, and Future of the gem5 Community Infrastructure."
-
-We invite the gem5 community to submit abstracts (1-2 paragraphs) for short presentations. The scope of this workshop is broadly the gem5 user and development community. Topics of interest include:
-
-* New features added to gem5
-* New models added to gem5
-* Extensions and integrations with other simulators
-* Experience using gem5
-* Validation of gem5 models
-
-We encourage accepted presentations to post a full paper to arXiv or other archival repository in order to give other users a citable source for your contribution. These sources may be cited in future gem5 release notes.
-
-Please submit your abstracts via this [Google Form](https://forms.gle/UnpFXRvpLEFKJBb46). The deadline to submit an abstract is April 10th and we will send notifications by April 14th before the ISCA early registration deadline (April 16th). Due to the close proximity to other deadlines/conferences and the early registration deadline, there will not be any extension.
-
-Form for abstract submission: <https://forms.gle/UnpFXRvpLEFKJBb46>
-
-More information can be found on the gem5 website: <https://www.gem5.org/events/isca-2020>
-Looking forward to seeing you in Valencia!
-
-### Draft Agenda for Workshop
-
-| Time      | Event                                                                                        |
-|-----------|----------------------------------------------------------------------------------------------|
-| 1-1:45    | Keynote: RE-gem5 and gem5-20: Past, Present, and Future of the gem5 Community Infrastructure |
-| 1:45-2    | Community feedback                                                                           |
-| 2-3       | Community presentations                                                                      |
-| 3-3:30    | Break                                                                                        |
-| 3:30-4:30 | Community presentations                                                                      |
-| 4:30-5    | Wrap up and more feedback                                                                    |